]> dgit.raspbian.org Git - git-annex.git/log
git-annex.git
23 months agoMerge tag '10.20240927'
Sean Whitton [Thu, 17 Oct 2024 02:59:17 +0000 (10:59 +0800)]
Merge tag '10.20240927'

tagging package git-annex version 10.20240927

23 months agoreleasing package git-annex version 10.20240927
Joey Hess [Mon, 30 Sep 2024 23:15:57 +0000 (19:15 -0400)]
releasing package git-annex version 10.20240927

23 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 30 Sep 2024 21:36:45 +0000 (17:36 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

23 months agofix build with old random
Joey Hess [Mon, 30 Sep 2024 21:36:19 +0000 (17:36 -0400)]
fix build with old random

getStdGen used to be an IO not a MonadIO action

23 months ago(no commit message)
brendan.ward@a2e11ad27f6b2fa2c556aea6811496e0d95dd0da [Mon, 30 Sep 2024 20:54:14 +0000 (20:54 +0000)]

23 months agofix build with random-1.2
Joey Hess [Mon, 30 Sep 2024 18:56:06 +0000 (14:56 -0400)]
fix build with random-1.2

getStdGen worked with that version but initStdGen is newer. For our
purposes, they are equivilant.

23 months agofix build with old base
Joey Hess [Mon, 30 Sep 2024 15:02:08 +0000 (11:02 -0400)]
fix build with old base

i386ancient has a base too old for NE.singleton

23 months agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Fri, 27 Sep 2024 19:31:31 +0000 (15:31 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

23 months agoRevert "remove stack-lts-18.13.yaml"
Joey Hess [Fri, 27 Sep 2024 19:30:51 +0000 (15:30 -0400)]
Revert "remove stack-lts-18.13.yaml"

This reverts commit b0546e8bde5a46767a405fbbc7a3907127533de8.

https://github.com/datalad/git-annex/issues/204 is still not fixed yet

23 months agoupdate version for release
Joey Hess [Fri, 27 Sep 2024 14:01:44 +0000 (10:01 -0400)]
update version for release

23 months agoremoved
mike@2d6d71f56ce2a992244350475251df87c26fe351 [Fri, 27 Sep 2024 12:18:59 +0000 (12:18 +0000)]
removed

23 months agoAdded a comment: corruption using git-annex-remote-rclone
mike@2d6d71f56ce2a992244350475251df87c26fe351 [Fri, 27 Sep 2024 12:18:41 +0000 (12:18 +0000)]
Added a comment: corruption using git-annex-remote-rclone

23 months agoAdded a comment: corruption using git-annex-remote-rclone
mike@2d6d71f56ce2a992244350475251df87c26fe351 [Fri, 27 Sep 2024 07:39:06 +0000 (07:39 +0000)]
Added a comment: corruption using git-annex-remote-rclone

23 months agoremove stack-lts-18.13.yaml
Joey Hess [Thu, 26 Sep 2024 22:46:12 +0000 (18:46 -0400)]
remove stack-lts-18.13.yaml

windows autobuilder should have been fixed by now

(offline so didn't check)

23 months agoremove read of the heads
Joey Hess [Thu, 26 Sep 2024 22:43:59 +0000 (18:43 -0400)]
remove read of the heads

and one tail

Removed head from Utility.PartialPrelude in order to avoid the build
warning with recent ghc versions as well.

23 months agouse NonEmpty for dirHashes
Joey Hess [Thu, 26 Sep 2024 22:15:00 +0000 (18:15 -0400)]
use NonEmpty for dirHashes

This avoids 4 uses of head.

23 months agoGit: use NonEmpty in fullconfig
Joey Hess [Thu, 26 Sep 2024 21:54:36 +0000 (17:54 -0400)]
Git: use NonEmpty in fullconfig

This is a nice win. Avoids partial functions, by encoding at the type
level the fact that fullconfig is never an empty list.

23 months agoavoid head
Joey Hess [Thu, 26 Sep 2024 21:53:00 +0000 (17:53 -0400)]
avoid head

While in some sense this is better, the use of NE.fromList is still
partial.

23 months agoavoid head
Joey Hess [Thu, 26 Sep 2024 21:52:19 +0000 (17:52 -0400)]
avoid head

Recent ghc has a deprecation warning on it.

This is not an improvement though. I know these cannot fail, but I can't
prove it to ghc.

23 months agoavoid head
Joey Hess [Thu, 26 Sep 2024 21:49:41 +0000 (17:49 -0400)]
avoid head

Seems like generate works fine to generate a single arbitrary value, I
dunno why I used sample' originally.

23 months agoremove slightly unsafe use of head
Joey Hess [Thu, 26 Sep 2024 21:21:22 +0000 (17:21 -0400)]
remove slightly unsafe use of head

If git rev-parse somehow didn't output anything, git-annex would crash
here.

2 years agosim: document interruption and concurrency issues
Joey Hess [Thu, 26 Sep 2024 16:26:47 +0000 (12:26 -0400)]
sim: document interruption and concurrency issues

Does not seem worth doing a lot of locking and detection of these
problems.

2 years agosim: Add metadata command
Joey Hess [Thu, 26 Sep 2024 16:20:37 +0000 (12:20 -0400)]
sim: Add metadata command

Only really needed for completeness, preferred content expressions can
match against metadata.

2 years agoheading
Joey Hess [Wed, 25 Sep 2024 18:54:55 +0000 (14:54 -0400)]
heading

2 years agoremove example, which didn't format right in mdwn
Joey Hess [Wed, 25 Sep 2024 18:54:21 +0000 (14:54 -0400)]
remove example, which didn't format right in mdwn

2 years agoformatting
Joey Hess [Wed, 25 Sep 2024 18:53:46 +0000 (14:53 -0400)]
formatting

2 years agoformatting
Joey Hess [Wed, 25 Sep 2024 18:50:17 +0000 (14:50 -0400)]
formatting

2 years agoformatting
Joey Hess [Wed, 25 Sep 2024 18:49:48 +0000 (14:49 -0400)]
formatting

2 years agosim: support "--" as comment
Joey Hess [Wed, 25 Sep 2024 18:47:32 +0000 (14:47 -0400)]
sim: support "--" as comment

Using this in my sim files that are also mdwn files to avoid comments
being displayed as headers.

2 years agopreparing for release later this week
Joey Hess [Wed, 25 Sep 2024 18:43:52 +0000 (14:43 -0400)]
preparing for release later this week

2 years agoMerge branch 'sim'
Joey Hess [Wed, 25 Sep 2024 18:42:27 +0000 (14:42 -0400)]
Merge branch 'sim'

2 years agoexport only the parts of aeson that are used
Joey Hess [Wed, 25 Sep 2024 18:41:23 +0000 (14:41 -0400)]
export only the parts of aeson that are used

Rather than hiding things not wanted. This fixes a build warning with
aeson-2.2.3 which no longer has a json function.

2 years agoupdate
Joey Hess [Wed, 25 Sep 2024 18:26:32 +0000 (14:26 -0400)]
update

2 years agofix tab damage that broke examples formatting in man page
Joey Hess [Wed, 25 Sep 2024 18:23:04 +0000 (14:23 -0400)]
fix tab damage that broke examples formatting in man page

When did vim default to expandtabs for mdwn? No.

2 years agosupport simulating clusters
Joey Hess [Wed, 25 Sep 2024 18:06:41 +0000 (14:06 -0400)]
support simulating clusters

Without actually simulating cluster implementation at all. Instead, only
the essential fact that cluster gateways know what changes they have
made to each node of a cluster. That is enough for sims like
sizebalanced_cluster.

2 years agodesign for simulating clusters w/o simulating cluster gateways
Joey Hess [Wed, 25 Sep 2024 16:58:26 +0000 (12:58 -0400)]
design for simulating clusters w/o simulating cluster gateways

2 years agoRevert "sim: add commands for cluster management"
Joey Hess [Wed, 25 Sep 2024 16:11:03 +0000 (12:11 -0400)]
Revert "sim: add commands for cluster management"

This reverts commit 344141da63a9f6c46b63a52a116c9757fcf80110.

Rethinking this

2 years agoupdate
Joey Hess [Wed, 25 Sep 2024 16:10:55 +0000 (12:10 -0400)]
update

2 years agosim: add commands for cluster management
Joey Hess [Wed, 25 Sep 2024 15:07:58 +0000 (11:07 -0400)]
sim: add commands for cluster management

Clusters are not actually simulated yet.

2 years agoAdded a comment: Re: default preferred content
nobodyinperson [Wed, 25 Sep 2024 09:25:42 +0000 (09:25 +0000)]
Added a comment: Re: default preferred content

2 years ago(no commit message)
nadir [Wed, 25 Sep 2024 06:41:27 +0000 (06:41 +0000)]

2 years agosim: quiesce before freezing or ending
Joey Hess [Tue, 24 Sep 2024 20:46:09 +0000 (16:46 -0400)]
sim: quiesce before freezing or ending

Probably a good idea for freezing, but especially I hope this fixes a
problem with git-annex sim run that caused it to sometimes crash in
removeDirectoryRecursive with directory not empty, presumably because a
thread was writing there at the same time.

2 years agosim: added run subcommand
Joey Hess [Tue, 24 Sep 2024 16:01:54 +0000 (12:01 -0400)]
sim: added run subcommand

And a nice sim of random preferred content expressions.

2 years agosim: add stepstable
Joey Hess [Tue, 24 Sep 2024 15:47:20 +0000 (11:47 -0400)]
sim: add stepstable

2 years agosim: random preferred content expression generation
Joey Hess [Tue, 24 Sep 2024 15:23:23 +0000 (11:23 -0400)]
sim: random preferred content expression generation

2 years agoprevent action or step from simulating running on a special remote
Joey Hess [Tue, 24 Sep 2024 14:07:09 +0000 (10:07 -0400)]
prevent action or step from simulating running on a special remote

Without any connections, the step command will not try to do any actions
on a special remote.

But even without any connections, it's still possible for a drop action
explicitly run "on" the special remote to do, when numcopies = 0 or
there is a trusted repo. So guard all actions against running on a
special remote too.

2 years agofix state overwrite bug
Joey Hess [Tue, 24 Sep 2024 14:00:38 +0000 (10:00 -0400)]
fix state overwrite bug

I have needed to excercise a lot of care in threading st through, and I
got it wrong here. Probably using a state monad would be a good idea.

2 years agoAdded a comment: Settable default preferred content?
adehnert [Tue, 24 Sep 2024 00:02:21 +0000 (00:02 +0000)]
Added a comment: Settable default preferred content?

2 years agoupdate test case for bug
Joey Hess [Mon, 23 Sep 2024 20:05:11 +0000 (16:05 -0400)]
update test case for bug

after recent changes broke the test case

the other bug I cannot reproduce though

2 years agooops
Joey Hess [Mon, 23 Sep 2024 20:02:39 +0000 (16:02 -0400)]
oops

2 years agosim: avoid step looking for new actions every time
Joey Hess [Mon, 23 Sep 2024 19:50:47 +0000 (15:50 -0400)]
sim: avoid step looking for new actions every time

Once it has a list of actions, it can perform them all.

A disappointing optimisation at least in my test case, which it sped up
by less than 1 second out of 12. But still it did make it faster.

2 years agosped up sim step by about 200%
Joey Hess [Mon, 23 Sep 2024 19:27:45 +0000 (15:27 -0400)]
sped up sim step by about 200%

Noticed that it was quite slow compared with things like action
sendwanted. Guessed that the slowdown is largely due to every step
doing a simulated git pull/push.

So, rather than always doing a pull/push, only do those when no actions
are found without doing a pull/push.

This does mean that step will sometimes experience a split brain
situation, but that seems like a good thing? Because step ought to
explore as many possible scenarios as it reasonably can.

2 years agoadded sim of sizebalanced in a splitbrain situation
Joey Hess [Mon, 23 Sep 2024 19:04:52 +0000 (15:04 -0400)]
added sim of sizebalanced in a splitbrain situation

2 years agoallow complex shell commands
Joey Hess [Mon, 23 Sep 2024 19:04:33 +0000 (15:04 -0400)]
allow complex shell commands

2 years agofix sizebalanced empty size bug
Joey Hess [Mon, 23 Sep 2024 18:30:18 +0000 (14:30 -0400)]
fix sizebalanced empty size bug

Fix bug that prevented anything being stored in an empty repository whose
preferred content expression uses sizebalanced.

2 years agoadds sims collection
Joey Hess [Mon, 23 Sep 2024 17:43:55 +0000 (13:43 -0400)]
adds sims collection

2 years agosim visit as first-class command
Joey Hess [Mon, 23 Sep 2024 17:09:35 +0000 (13:09 -0400)]
sim visit as first-class command

Allows using it in a sim file.

2 years agosim: Fix size tracking for balanced preferred content
Joey Hess [Mon, 23 Sep 2024 16:28:18 +0000 (12:28 -0400)]
sim: Fix size tracking for balanced preferred content

2 years agoupdate
Joey Hess [Mon, 23 Sep 2024 13:38:56 +0000 (09:38 -0400)]
update

2 years agoremoved
AaronBrooks [Sun, 22 Sep 2024 22:21:32 +0000 (22:21 +0000)]
removed

2 years agoAdded a comment: reinject files -- more efficiently
AaronBrooks [Sun, 22 Sep 2024 22:21:05 +0000 (22:21 +0000)]
Added a comment: reinject files -- more efficiently

2 years agoAdded a comment: reinject files -- more efficiently
AaronBrooks [Sun, 22 Sep 2024 22:19:13 +0000 (22:19 +0000)]
Added a comment: reinject files -- more efficiently

2 years agosim: fix state loss bug
Joey Hess [Fri, 20 Sep 2024 22:11:37 +0000 (18:11 -0400)]
sim: fix state loss bug

2 years agopuzzling bug
Joey Hess [Fri, 20 Sep 2024 20:53:40 +0000 (16:53 -0400)]
puzzling bug

2 years agoinvalidate caches after log changes
Joey Hess [Fri, 20 Sep 2024 20:52:17 +0000 (16:52 -0400)]
invalidate caches after log changes

This seems like something Annex.Sim would need to happen. And generally
a really good idea.

2 years agoavoid adding redundant present/notpresent to sim history
Joey Hess [Fri, 20 Sep 2024 19:45:05 +0000 (15:45 -0400)]
avoid adding redundant present/notpresent to sim history

2 years agobugfixes
Joey Hess [Fri, 20 Sep 2024 19:39:52 +0000 (15:39 -0400)]
bugfixes

sim stabilization works now

2 years agosim: better step
Joey Hess [Fri, 20 Sep 2024 19:21:18 +0000 (15:21 -0400)]
sim: better step

On each step, find all the actions that could be done, and pick one of them
to do.

Should detect stability, but that is broken.

2 years agoset simRootDirectory on restore
Joey Hess [Fri, 20 Sep 2024 19:11:55 +0000 (15:11 -0400)]
set simRootDirectory on restore

It's a relative directory and the cwd may be different. Or the repo
could have been moved.

2 years agoremove sim log file
Joey Hess [Fri, 20 Sep 2024 18:57:55 +0000 (14:57 -0400)]
remove sim log file

2 years agoupdate
Joey Hess [Fri, 20 Sep 2024 15:59:35 +0000 (11:59 -0400)]
update

2 years agoupdate
Joey Hess [Fri, 20 Sep 2024 15:26:40 +0000 (11:26 -0400)]
update

2 years agoupdate
Joey Hess [Fri, 20 Sep 2024 15:05:57 +0000 (11:05 -0400)]
update

2 years agosim: implement addtree
Joey Hess [Fri, 20 Sep 2024 14:34:52 +0000 (10:34 -0400)]
sim: implement addtree

2 years agocomment
Joey Hess [Wed, 18 Sep 2024 13:08:42 +0000 (09:08 -0400)]
comment

2 years agosim: tested concurrency over actions
Joey Hess [Tue, 17 Sep 2024 18:39:53 +0000 (14:39 -0400)]
sim: tested concurrency over actions

This demonstrates concurrent behavior that looks right. And with a
random seed, the results are deterministic.

init foo
init bar
init backup
connect foo <-> bar
connect foo <-> backup
addmulti 10 testfiles 1mb 1gb foo backup
action foo gitpull backup
wanted foo nothing
wanted bar anything
wanted backup anything
action bar gitpull foo
action foo dropunwanted while action bar getwanted foo

2 years agosim: fix get bug
Joey Hess [Tue, 17 Sep 2024 18:29:49 +0000 (14:29 -0400)]
sim: fix get bug

When getting from a remote, have to check that the repo doing the
getting thinks the remote contains the key, but also that the remote
actually does. Before this bug fix, it would get from a repo that used
to have the key, but that had dropped it since the last git pull.

2 years agorecord initial seed in sim log
Joey Hess [Tue, 17 Sep 2024 17:49:50 +0000 (13:49 -0400)]
record initial seed in sim log

Unless the log starts with a command that records a seed.

2 years agogit-annex sim log
Joey Hess [Tue, 17 Sep 2024 17:43:11 +0000 (13:43 -0400)]
git-annex sim log

2 years agosim: implement dropunwantedfrom
Joey Hess [Tue, 17 Sep 2024 17:35:27 +0000 (13:35 -0400)]
sim: implement dropunwantedfrom

2 years agofix ActionDropUnwanted
Joey Hess [Tue, 17 Sep 2024 15:55:57 +0000 (11:55 -0400)]
fix ActionDropUnwanted

Now tested working

2 years agosim: add missing parser for action sendwanted
Joey Hess [Tue, 17 Sep 2024 15:40:40 +0000 (11:40 -0400)]
sim: add missing parser for action sendwanted

2 years agosim: fix changing settings bug
Joey Hess [Tue, 17 Sep 2024 15:37:25 +0000 (11:37 -0400)]
sim: fix changing settings bug

2 years agoaddmulti
Joey Hess [Tue, 17 Sep 2024 15:19:59 +0000 (11:19 -0400)]
addmulti

2 years agomove pull/push/sync into getSimActionComponents
Joey Hess [Tue, 17 Sep 2024 14:50:25 +0000 (10:50 -0400)]
move pull/push/sync into getSimActionComponents

As well as being a more pleasing implementation than I managed
yesterday, this allows for those actions to be run concurrently in the
sim.

2 years agosim concurrency
Joey Hess [Tue, 17 Sep 2024 13:33:55 +0000 (09:33 -0400)]
sim concurrency

2 years agoadd
Joey Hess [Tue, 17 Sep 2024 12:31:55 +0000 (08:31 -0400)]
add

2 years agoimplement ActionPull/Pull/Sync
Joey Hess [Mon, 16 Sep 2024 20:58:03 +0000 (16:58 -0400)]
implement ActionPull/Pull/Sync

Somewhat unsatisfying implementation, but all the alternatives were
worse.

2 years agosim: add action repo sync command
Joey Hess [Mon, 16 Sep 2024 20:48:21 +0000 (16:48 -0400)]
sim: add action repo sync command

2 years agosim command fixes
Joey Hess [Thu, 12 Sep 2024 20:39:44 +0000 (16:39 -0400)]
sim command fixes

2 years agogit-annex sim command is working
Joey Hess [Thu, 12 Sep 2024 20:07:44 +0000 (16:07 -0400)]
git-annex sim command is working

Had to add Read instances to Key and NumCopies and some other similar
types. I only expect to use those in serializing a sim. Of course, this
risks that implementation changes break reading old data. For a sim,
that would not be a big problem.

2 years agoAdded a comment
mike@2d6d71f56ce2a992244350475251df87c26fe351 [Thu, 12 Sep 2024 15:40:24 +0000 (15:40 +0000)]
Added a comment

2 years agoAdded a comment: 👍 +1 for encrypting the annex on regular git remotes
nobodyinperson [Thu, 12 Sep 2024 14:51:20 +0000 (14:51 +0000)]
Added a comment: 👍 +1 for encrypting the annex on regular git remotes

2 years agoimplemented ActionDropUnwanted
Joey Hess [Thu, 12 Sep 2024 14:44:31 +0000 (10:44 -0400)]
implemented ActionDropUnwanted

Not tested yet. This emulates the same checking that is done when
dropping. Note that when dropping from a special remote it is not able
to make a locked copy.

2 years agoconvert simRepoState to use UUID as key
Joey Hess [Thu, 12 Sep 2024 14:08:50 +0000 (10:08 -0400)]
convert simRepoState to use UUID as key

2 years ago(no commit message)
m.szczepanik@8dd0314f20fa09be99ee3903d1c04a80eafbd849 [Thu, 12 Sep 2024 12:13:06 +0000 (12:13 +0000)]

2 years agoAdded a comment
mike@2d6d71f56ce2a992244350475251df87c26fe351 [Thu, 12 Sep 2024 05:22:18 +0000 (05:22 +0000)]
Added a comment

2 years agofully preserve input format of connect and disconnect commands
Joey Hess [Thu, 12 Sep 2024 01:00:51 +0000 (21:00 -0400)]
fully preserve input format of connect and disconnect commands

Just lifted the sim file as a DSL into the type level for that.

2 years agoinitial report on that addunlocked is not respected during import
yarikoptic [Wed, 11 Sep 2024 20:47:45 +0000 (20:47 +0000)]
initial report on that addunlocked is not respected during import

2 years agosim file parser and generator
Joey Hess [Wed, 11 Sep 2024 19:59:13 +0000 (15:59 -0400)]
sim file parser and generator

The generator doesn't emit the best possible connect commands,
but it does output something valid. Eg, an input like:

connect A <-> B <-> C <-> D

becomes:

connect A <-> B <-> C
connect C <-> D

Also:

connect A -> B <- C

becomes:

connect A -> B
connect C -> B

Which could be improved.

Also disconnect commands are not prettified at all, but probably there's
no reason to.