git-annex.git
3 years agoAdded a comment
nobodyinperson [Sat, 15 Jul 2023 17:04:38 +0000 (17:04 +0000)]
Added a comment

3 years agocomment
Joey Hess [Sat, 15 Jul 2023 16:28:32 +0000 (12:28 -0400)]
comment

3 years agoSuggest onlyingroup preferred content expression
nobodyinperson [Sat, 15 Jul 2023 11:19:27 +0000 (11:19 +0000)]
Suggest onlyingroup preferred content expression

3 years agoAdded a comment: git annex drop --unused --jobs=cpus works
nobodyinperson [Sat, 15 Jul 2023 05:53:43 +0000 (05:53 +0000)]
Added a comment: git annex drop --unused --jobs=cpus works

3 years ago(no commit message)
agot [Fri, 14 Jul 2023 22:31:05 +0000 (22:31 +0000)]

3 years ago(no commit message)
agot [Fri, 14 Jul 2023 19:14:34 +0000 (19:14 +0000)]

3 years agocomment
Joey Hess [Fri, 14 Jul 2023 00:02:41 +0000 (20:02 -0400)]
comment

3 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 13 Jul 2023 23:58:36 +0000 (19:58 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

3 years agoadd a warning and a related todo
Joey Hess [Thu, 13 Jul 2023 23:57:34 +0000 (19:57 -0400)]
add a warning and a related todo

arising from a conversation at FOSSY

3 years agofix formatting of \ continued shell examples in man pages
Joey Hess [Thu, 13 Jul 2023 23:55:38 +0000 (19:55 -0400)]
fix formatting of \ continued shell examples in man pages

doc/git-annex-filter-branch.mdwn and one other file have these, and no
other files have \ at the end of line, so this should be safe

3 years agoAdded a comment: git mv to temporary name, commit, git mv back, commit, can resolve...
ewen [Thu, 13 Jul 2023 01:12:34 +0000 (01:12 +0000)]
Added a comment: git mv to temporary name, commit, git mv back, commit, can resolve duplicates

3 years agoAdded a comment
ewen [Thu, 13 Jul 2023 00:54:35 +0000 (00:54 +0000)]
Added a comment

3 years agoAdded a comment: Plumbing commands vs Porcelain commands
ewen [Thu, 13 Jul 2023 00:26:20 +0000 (00:26 +0000)]
Added a comment: Plumbing commands vs Porcelain commands

3 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 12 Jul 2023 17:55:10 +0000 (13:55 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

3 years agocomment
Joey Hess [Wed, 12 Jul 2023 17:54:59 +0000 (13:54 -0400)]
comment

3 years agoAdded a comment
jkniiv [Wed, 12 Jul 2023 17:30:52 +0000 (17:30 +0000)]
Added a comment

3 years agocomment
Joey Hess [Wed, 12 Jul 2023 17:27:33 +0000 (13:27 -0400)]
comment

3 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 12 Jul 2023 16:57:46 +0000 (12:57 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

3 years agoAdded a comment
jkniiv [Wed, 12 Jul 2023 16:25:49 +0000 (16:25 +0000)]
Added a comment

3 years agoAdded a comment
nobodyinperson [Wed, 12 Jul 2023 13:10:26 +0000 (13:10 +0000)]
Added a comment

3 years agoAdded a comment: Alternative proposal for better backwards compatibility
ewen [Wed, 12 Jul 2023 12:48:04 +0000 (12:48 +0000)]
Added a comment: Alternative proposal for better backwards compatibility

3 years agoAdded a comment: Clarification
nobodyinperson [Wed, 12 Jul 2023 11:29:41 +0000 (11:29 +0000)]
Added a comment: Clarification

3 years agoAdded a comment: There is already something like fullsync: `git annex assist`, sugges...
nobodyinperson [Wed, 12 Jul 2023 11:15:26 +0000 (11:15 +0000)]
Added a comment: There is already something like fullsync: `git annex assist`, suggestion: new `metasync` command

3 years agoAdded a comment: Preferred content settings not really an alternative
ewen [Wed, 12 Jul 2023 10:53:41 +0000 (10:53 +0000)]
Added a comment: Preferred content settings not really an alternative

3 years agoAdded a comment: History of change
ewen [Wed, 12 Jul 2023 10:27:43 +0000 (10:27 +0000)]
Added a comment: History of change

3 years agoAdded a comment: Breaking change to "sync"
ewen [Wed, 12 Jul 2023 10:21:04 +0000 (10:21 +0000)]
Added a comment: Breaking change to "sync"

3 years agoAdded a comment
nobodyinperson [Wed, 12 Jul 2023 09:21:56 +0000 (09:21 +0000)]
Added a comment

3 years agoAdded a comment
jkniiv [Wed, 12 Jul 2023 07:33:16 +0000 (07:33 +0000)]
Added a comment

3 years agoAdded a comment: I have to agree that this change to `sync` is annoying
jkniiv [Wed, 12 Jul 2023 07:18:54 +0000 (07:18 +0000)]
Added a comment: I have to agree that this change to `sync` is annoying

3 years agoRecommend accepting "list" output encoding of filename as input too
ewen [Wed, 12 Jul 2023 06:54:05 +0000 (06:54 +0000)]
Recommend accepting "list" output encoding of filename as input too

3 years agoAdded a comment
nobodyinperson [Wed, 12 Jul 2023 06:49:48 +0000 (06:49 +0000)]
Added a comment

3 years agoSuggest using "git annex fullsync" to trigger a full sync, not changing "git annex...
ewen [Wed, 12 Jul 2023 04:16:48 +0000 (04:16 +0000)]
Suggest using "git annex fullsync" to trigger a full sync, not changing "git annex sync" behaviour

3 years agofix waiting for all started feed downloads with -J
Joey Hess [Wed, 12 Jul 2023 02:08:19 +0000 (22:08 -0400)]
fix waiting for all started feed downloads with -J

importfeed bug fix: When -J was used with multiple feeds, some feeds did
not get their items downloaded.

In my case, I had added a feed to the end of the list, and no items from it
were ever downloaded.

Sponsored-by: Leon Schuermann on Patreon
3 years ago(no commit message)
nobodyinperson [Tue, 11 Jul 2023 20:39:34 +0000 (20:39 +0000)]

3 years agoAdded a comment
jstritch [Tue, 11 Jul 2023 18:56:40 +0000 (18:56 +0000)]
Added a comment

3 years agoresponse
Joey Hess [Mon, 10 Jul 2023 19:20:01 +0000 (15:20 -0400)]
response

3 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Mon, 10 Jul 2023 19:18:00 +0000 (15:18 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

3 years ago(no commit message)
nadir [Mon, 10 Jul 2023 07:37:07 +0000 (07:37 +0000)]

3 years ago(no commit message)
nadir [Mon, 10 Jul 2023 07:20:45 +0000 (07:20 +0000)]

3 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Sun, 9 Jul 2023 20:54:30 +0000 (16:54 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

3 years agonub list of files
Joey Hess [Sun, 9 Jul 2023 18:18:25 +0000 (14:18 -0400)]
nub list of files

yt-dlp when resumed was observed having written the same filename twice
into the file list. Perhaps once by the first download and once by the
resumed one?

3 years agoremoved
dud225@35a1ee469f82f3a7eb1f2dce4ad453f5e47bdfd3 [Fri, 7 Jul 2023 14:16:38 +0000 (14:16 +0000)]
removed

3 years agoAdded a comment: Disabling a special remote
dud225@35a1ee469f82f3a7eb1f2dce4ad453f5e47bdfd3 [Fri, 7 Jul 2023 14:16:24 +0000 (14:16 +0000)]
Added a comment: Disabling a special remote

3 years agoAdded a comment: Disabling a special remote
dud225@35a1ee469f82f3a7eb1f2dce4ad453f5e47bdfd3 [Fri, 7 Jul 2023 12:51:12 +0000 (12:51 +0000)]
Added a comment: Disabling a special remote

3 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Thu, 6 Jul 2023 16:50:04 +0000 (12:50 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

3 years agosync: When in an adjusted branch, merge changes from the original branch
Joey Hess [Thu, 6 Jul 2023 16:42:00 +0000 (12:42 -0400)]
sync: When in an adjusted branch, merge changes from the original branch

This causes changes to the original branch to get merged with a single
sync. Before, it took 2 syncs; the first happened to update the synced/
branch, and the second merged changes from the synced/ branch into the
ajusted branch.

Using mergeToAdjustedBranch when tomerge == origbranch is probably
overkill, but it does work fine.

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
3 years agoAdded a comment
nobodyinperson [Thu, 6 Jul 2023 05:52:50 +0000 (05:52 +0000)]
Added a comment

3 years agoAdded a comment
nobodyinperson [Thu, 6 Jul 2023 05:44:57 +0000 (05:44 +0000)]
Added a comment

3 years agoimportfeed: Add feedurl to the metadata
Joey Hess [Thu, 6 Jul 2023 04:10:19 +0000 (00:10 -0400)]
importfeed: Add feedurl to the metadata

(And allow it to be used in the --template although that seems unlikely to
be very useful.)

My use case for this is that one of the podcast feeds I subscribe to is
sometimes leaking episodes of some other podcast. The other podcast is also
very close to spam, so this may be a form of intentional spamming. I have
not been able to catch the podcast feed containing those episodes, so I
don't know which one is at fault. So putting this in the metadata will let
me eventually catch it.

3 years agocomment
Joey Hess [Wed, 5 Jul 2023 21:39:26 +0000 (17:39 -0400)]
comment

3 years agocomment
Joey Hess [Wed, 5 Jul 2023 21:20:47 +0000 (17:20 -0400)]
comment

3 years agopropigateAdjustedCommits: avoid overwriting diverged original branch
Joey Hess [Wed, 5 Jul 2023 21:01:39 +0000 (17:01 -0400)]
propigateAdjustedCommits: avoid overwriting diverged original branch

Bug fix: Re-running git-annex adjust or sync when in an adjusted branch
would overwrite the original branch, losing any commits that had been made
to it since the adjusted branch was created.

When git-annex adjust is run in this situation, it will display a warning
about the diverged branches.

When git-annex sync is run in this situation, mergeToAdjustedBranch
will merge the changes from the original branch to the adjusted branch.
So it does not need to display the divergence warning.

Note that for some reason, I'm needing to run sync twice for that to
happen. The first run does not do the merge and the second does. I'm unsure
why and so am not fully done with this bug.

Sponsored-By: the NIH-funded NICEMAN (ReproNim TR&D3) project
3 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 5 Jul 2023 20:55:10 +0000 (16:55 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

3 years agocomment
Joey Hess [Wed, 5 Jul 2023 20:54:52 +0000 (16:54 -0400)]
comment

3 years agoAdded a comment
nobodyinperson [Wed, 5 Jul 2023 20:46:13 +0000 (20:46 +0000)]
Added a comment

3 years agodiffdriver --text support options for diff
Joey Hess [Wed, 5 Jul 2023 19:43:29 +0000 (15:43 -0400)]
diffdriver --text support options for diff

Sponsored-by: KDM on Patreon
3 years agoremove redundant example
Joey Hess [Wed, 5 Jul 2023 19:05:23 +0000 (15:05 -0400)]
remove redundant example

The paragraph just above already shows how to configure .gitattributes
and the necessary git config. So this is redundant. Also, it makes
.gitattributes match *, which is likely not a good idea because those
files are not likely to be all text files.

3 years agomove new video into feed
Joey Hess [Wed, 5 Jul 2023 18:54:21 +0000 (14:54 -0400)]
move new video into feed

3 years agoFix breakage when git is configured with safe.bareRepository = explicit
Joey Hess [Wed, 5 Jul 2023 18:43:02 +0000 (14:43 -0400)]
Fix breakage when git is configured with safe.bareRepository = explicit

Running git config --list inside .git then fails, so better to only
do that when --git-dir was specified explicitly. Otherwise, when the
repository is not bare, run the command inside the working tree.

Also make init detect when the uuid it just set cannot be read and fail
with an error, in case git changes something that breaks this later.

I still don't actually understand why git-annex add/assist -J2 was
affected but -J1 was not. But I did show that it was skipping writing to
the location log, because the uuid was NoUUID.

Sponsored-by: Graham Spencer on Patreon
3 years agorenamed bug
Joey Hess [Wed, 5 Jul 2023 18:09:21 +0000 (14:09 -0400)]
renamed bug

3 years agoerk
Joey Hess [Wed, 5 Jul 2023 17:57:28 +0000 (13:57 -0400)]
erk

3 years agoalso affects add
Joey Hess [Wed, 5 Jul 2023 17:42:52 +0000 (13:42 -0400)]
also affects add

3 years agoassist: With --jobs, parallelize transferring content to/from remotes
Joey Hess [Wed, 5 Jul 2023 16:24:04 +0000 (12:24 -0400)]
assist: With --jobs, parallelize transferring content to/from remotes

Command.Add.seek starts concurrency with CommandStages. And for
Command.Sync, it needs TransferStages. So, to get both types of concurrency
for the two different parts, it either needs to change the type of
concurrency in between, or just call startConcurrency once for each.

It seems safe enough to call startConcurrency twice, because it does shut
down concurrency (mostly) at the end, and eg the old Annex.workers get
emptied.

Sponsored-by: unqueued on Patreon
3 years agobug
Joey Hess [Wed, 5 Jul 2023 16:11:48 +0000 (12:11 -0400)]
bug

3 years agoMerge branch 'master' of ssh://git-annex.branchable.com
Joey Hess [Wed, 5 Jul 2023 15:54:43 +0000 (11:54 -0400)]
Merge branch 'master' of ssh://git-annex.branchable.com

3 years agoupdate
Joey Hess [Wed, 5 Jul 2023 15:49:25 +0000 (11:49 -0400)]
update

3 years agoAdded a comment: Disabling a special remote
dud225@35a1ee469f82f3a7eb1f2dce4ad453f5e47bdfd3 [Tue, 4 Jul 2023 20:54:19 +0000 (20:54 +0000)]
Added a comment: Disabling a special remote

3 years ago(no commit message)
nobodyinperson [Tue, 4 Jul 2023 18:49:01 +0000 (18:49 +0000)]

3 years ago(no commit message)
nobodyinperson [Mon, 3 Jul 2023 13:45:36 +0000 (13:45 +0000)]

3 years agoAdd --text example to diffdriver man page
Yann Büchau [Mon, 3 Jul 2023 11:19:45 +0000 (13:19 +0200)]
Add --text example to diffdriver man page

3 years ago(no commit message)
nobodyinperson [Mon, 3 Jul 2023 11:08:36 +0000 (11:08 +0000)]

3 years agofix suggestion to use enableremote
Joey Hess [Sun, 2 Jul 2023 19:01:02 +0000 (15:01 -0400)]
fix suggestion to use enableremote

3 years agoAdd link to Yann's talk to videos list
nobodyinperson [Sat, 1 Jul 2023 22:21:42 +0000 (22:21 +0000)]
Add link to Yann's talk to videos list

3 years agoinitial report on annex sync odd behavior loosing my precious commit
yarikoptic [Fri, 30 Jun 2023 19:39:46 +0000 (19:39 +0000)]
initial report on annex sync odd behavior loosing my precious commit

3 years agoAdded a comment: WiFi without broadcasting
nobodyinperson [Fri, 30 Jun 2023 07:56:03 +0000 (07:56 +0000)]
Added a comment: WiFi without broadcasting

3 years agoAdded a comment: Thanks for git annex satisfy, numcopies question
nobodyinperson [Fri, 30 Jun 2023 05:37:06 +0000 (05:37 +0000)]
Added a comment: Thanks for git annex satisfy, numcopies question

3 years agoidea
Joey Hess [Thu, 29 Jun 2023 21:00:32 +0000 (17:00 -0400)]
idea

3 years agoupdate
Joey Hess [Thu, 29 Jun 2023 19:40:37 +0000 (15:40 -0400)]
update

3 years agoadd a warning about --json not being self describing
Joey Hess [Thu, 29 Jun 2023 19:38:37 +0000 (15:38 -0400)]
add a warning about --json not being self describing

It was a mistake for mirror to support --json, but that happened long
ago and it doesn't seem worth removing. I doubt anyone will use it.

3 years agoadded git-annex satisfy
Joey Hess [Thu, 29 Jun 2023 19:34:53 +0000 (15:34 -0400)]
added git-annex satisfy

This ended up having an interface like sync, rather than like get/copy/drop.
That let it be implemented in terms of sync, which took a lot less code.
Also, it lets it handle many of the edge cases that sync does, such as
getting files that are not visible in a --hide-missing branch, and sending
files to exporttree remotes.

As well as being easier to implement, `git-annex satisfy myremote` makes
sense as it satisfies the preferred content settings of the remote.
`git-annex satisfy somefile` does not form a sentence that makes sense. So
while -C can be a little bit annoying, it still makes sense to have this
syntax.

Note that, while I initially thought this would also satisfy numcopies, it
does not. Arguably it ought to. But, sync does not send files in order to
satisfy numcopies, it only sends files to satisfy preferred content. And
it's important that this transfer the same files as sync does, because
it will probably be used in a workflow where the user sometimes syncs and
sometimes satisfies, and does not expect satisfy to do things that sync
would not do.

(Also opened a new bug that also affects sync et all, not only this command.)

Sponsored-by: Nicholas Golder-Manning on Patreon
3 years agodocument git-annex satisfy
Joey Hess [Thu, 29 Jun 2023 18:15:01 +0000 (14:15 -0400)]
document git-annex satisfy

3 years agoidea
Joey Hess [Thu, 29 Jun 2023 17:59:00 +0000 (13:59 -0400)]
idea

3 years agocomments
Joey Hess [Thu, 29 Jun 2023 17:57:27 +0000 (13:57 -0400)]
comments

3 years agoconfirm
Joey Hess [Thu, 29 Jun 2023 17:44:52 +0000 (13:44 -0400)]
confirm

3 years agofix syntax
Joey Hess [Thu, 29 Jun 2023 17:32:16 +0000 (13:32 -0400)]
fix syntax

3 years agofix syntax
Joey Hess [Thu, 29 Jun 2023 17:31:27 +0000 (13:31 -0400)]
fix syntax

3 years agotag todos potentially useful for datalad
Joey Hess [Thu, 29 Jun 2023 17:30:26 +0000 (13:30 -0400)]
tag todos potentially useful for datalad

3 years agoAdded a comment: How about `git annex transfer`?
nobodyinperson [Thu, 29 Jun 2023 05:25:50 +0000 (05:25 +0000)]
Added a comment: How about `git annex transfer`?

3 years agoAdded a comment
nobodyinperson [Thu, 29 Jun 2023 05:20:56 +0000 (05:20 +0000)]
Added a comment

3 years ago(no commit message)
pat [Thu, 29 Jun 2023 04:45:15 +0000 (04:45 +0000)]

3 years agofor some reason I couldn't add a page comment so had to resort to an inline comment
jkniiv [Wed, 28 Jun 2023 22:26:04 +0000 (22:26 +0000)]
for some reason I couldn't add a page comment so had to resort to an inline comment

3 years agoAdded a comment: Awesome, thanks!
nobodyinperson [Wed, 28 Jun 2023 21:09:51 +0000 (21:09 +0000)]
Added a comment: Awesome, thanks!

3 years agodiffdriver: Added --text option for easy diffing of the contents of annexed text...
Joey Hess [Wed, 28 Jun 2023 19:26:46 +0000 (15:26 -0400)]
diffdriver: Added --text option for easy diffing of the contents of annexed text files

This was already possible, but it was rather hard to come up with the
complex shell command needed.

Note that the diff output starts with "diff a/... b/...".
I left off the "--git" because it's not a git format diff.

3 years agofix quoting in example
Joey Hess [Wed, 28 Jun 2023 18:44:42 +0000 (14:44 -0400)]
fix quoting in example

3 years agocomment
Joey Hess [Wed, 28 Jun 2023 17:36:49 +0000 (13:36 -0400)]
comment

3 years agoresponse
Joey Hess [Wed, 28 Jun 2023 17:26:06 +0000 (13:26 -0400)]
response

3 years agotodo
Joey Hess [Wed, 28 Jun 2023 17:23:37 +0000 (13:23 -0400)]
todo

3 years agofix some typos
Joey Hess [Wed, 28 Jun 2023 17:15:06 +0000 (13:15 -0400)]
fix some typos

Anarcat fixed these in the news file, so transferred it over

3 years agocomment
Joey Hess [Wed, 28 Jun 2023 17:14:11 +0000 (13:14 -0400)]
comment

3 years agoresponse
Joey Hess [Wed, 28 Jun 2023 17:08:12 +0000 (13:08 -0400)]
response