Commit graph

44657 commits

Author SHA1 Message Date
Joey Hess
cee12f6a2f
multiple -m
sync, assist, import: Allow -m option to be specified multiple times, to
provide additional paragraphs for the commit message.

The option parser didn't allow multiple -m before, so there is no risk of
behavior change breaking something that was for some reason using multiple
-m already.

Pass through to git commands, so that the method used to assemble the
paragrahs is whatever git does. Which might conceivably change in the
future.

Note that git commit-tree has supported -m since git 1.7.7. commitTree
was probably not using it since it predates that version. Since the
configure script prevents building git-annex with git older than 2.1,
there is no risk that it's not supported now.

Sponsored-by: Nicholas Golder-Manning on Patreon
2024-03-27 15:58:27 -04:00
Joey Hess
377e9fff18
fix typo 2024-03-27 12:45:40 -04:00
d@403a635aa8eaa8bfa8613acb6a375d9e06ed7001
b886aefe69 Added a comment 2024-03-27 13:26:34 +00:00
Joey Hess
e32a5166a0
Merge branch 'master' of ssh://git-annex.branchable.com 2024-03-26 18:19:29 -04:00
Joey Hess
8d35ea976c
todo 2024-03-26 18:19:23 -04:00
yarikoptic
6b837d17c2 Added a comment 2024-03-26 19:13:15 +00:00
Joey Hess
e23721f579
fix build warning
A recent change made plumbing the backend through fsck unncessary.

Left fsck checking backend and skipping operating on key when it could
not find one. Not checking the backend would be a behavior change.
For example the command git-annex fsck --key FOO--bar does nothing
since FOO is not a known backend. If this were removed it would
instead go on and fsck it and warn that no copies exist of the key.
That behavior change seems like it would be fine, but I also have no
reason to make it.
2024-03-26 14:13:59 -04:00
Joey Hess
f601e06b90
avoid build warning on windows 2024-03-26 14:07:41 -04:00
Joey Hess
81608c3c37
windows build fix 2024-03-26 13:51:51 -04:00
Joey Hess
fc04e6fa58
comment 2024-03-26 13:48:57 -04:00
Joey Hess
962da7bcf9
update for new rclone gitannex command 2024-03-26 13:48:43 -04:00
Joey Hess
a3a09f20e9
Merge branch 'master' of ssh://git-annex.branchable.com 2024-03-26 13:17:09 -04:00
Joey Hess
a69871491f
avoid build warning on windows
Since append was only exported by Annex.Common on unix, excluding it
from import caused a build warning on windows.
2024-03-26 13:16:33 -04:00
Joey Hess
07baa7ffcf
fix build on windows
deletestale renamed from cleanstale
2024-03-26 13:12:58 -04:00
Joey Hess
418e97e847
fix build warnings on windows 2024-03-26 13:11:53 -04:00
Joey Hess
7c5007279c
Windows: Fix escaping output to terminal when using old versions of MinTTY 2024-03-26 13:09:21 -04:00
Joey Hess
db95de6f2b
clean up windows build warnings about unused imports 2024-03-26 13:06:52 -04:00
d@403a635aa8eaa8bfa8613acb6a375d9e06ed7001
4a6d17c8f9 Added a comment 2024-03-26 14:07:19 +00:00
Joey Hess
9f0295495d
Merge branch 'master' of ssh://git-annex.branchable.com 2024-03-25 14:53:02 -04:00
Joey Hess
331f9dd764
link to commit 2024-03-25 14:51:36 -04:00
Joey Hess
f04d9574d6
fix transfer lock file for Download to not include uuid
While redundant concurrent transfers were already prevented in most
cases, it failed to prevent the case where two different repositories were
sending the same content to the same repository. By removing the uuid
from the transfer lock file for Download transfers, one repository
sending content will block the other one from also sending the same
content.

In order to interoperate with old git-annex, the old lock file is still
locked, as well as locking the new one. That added a lot of extra code
and work, and the plan is to eventually stop locking the old lock file,
at some point in time when an old git-annex process is unlikely to be
running at the same time.

Note that in the case of 2 repositories both doing eg
`git-annex copy foo --to origin`
the output is not that great:

copy b (to origin...)
  transfer already in progress, or unable to take transfer lock
git-annex: transfer already in progress, or unable to take transfer lock
97%   966.81 MiB      534 GiB/s 0sp2pstdio: 1 failed

  Lost connection (fd:14: hPutBuf: resource vanished (Broken pipe))

  Transfer failed

Perhaps that output could be cleaned up? Anyway, it's a lot better than letting
the redundant transfer happen and then failing with an obscure error about
a temp file, which is what it did before. And it seems users don't often
try to do this, since nobody ever reported this bug to me before.
(The "97%" there is actually how far along the *other* transfer is.)

Sponsored-by: Joshua Antonishen on Patreon
2024-03-25 14:47:46 -04:00
Joey Hess
62129f0b24
fix windows transfer lock check
If the lock file was not able to be exclusivlely locked, don't indicate
locking failed. I'm pretty sure this was a typo. It goes all the way
back to 891c85cd88 where locking was first
introduced on windows, and there's no indication of why it would make
sense to return True here.

Sponsored-by: Leon Schuermann on Patreon
2024-03-25 14:11:25 -04:00
nobodyinperson
f937658edf Add news of git-annex merch from hellotux.com 2024-03-25 06:27:48 +00:00
nobodyinperson
7c7b9f5da9 Add link to hellotux.com git-annex shirts 2024-03-25 06:18:36 +00:00
Joey Hess
1ace305159
bug 2024-03-24 15:05:49 -04:00
Joey Hess
3d55a7ac02
comment 2024-03-22 11:07:00 -04:00
Joey Hess
0c6eb2f1c9
comment 2024-03-22 11:00:51 -04:00
Joey Hess
dee249ac51
fix name of option 2024-03-22 10:54:14 -04:00
poelzi
b8fe213e5a 2024-03-20 21:22:36 +00:00
Joey Hess
332b0e778c
policy on AI generated content 2024-03-18 16:57:54 -04:00
Joey Hess
1ce7dedf40
Merge branch 'master' of ssh://git-annex.branchable.com 2024-03-15 16:15:23 -04:00
Joey Hess
9bf4f2eb16
fix reversion in unexport when unable to rename
Bug introduced in commit 7cef5e8f35
2024-03-15 16:14:44 -04:00
Joey Hess
f001ae7c09
update 2024-03-15 10:21:21 -04:00
oadams
11b609763e Added a comment: Need for git-annex-remote-rclone 2024-03-14 01:03:46 +00:00
Joey Hess
7d407516c4
update 2024-03-13 11:21:05 -04:00
Joey Hess
e7bd6b8e6e
update 2024-03-13 11:19:04 -04:00
Joey Hess
ff05c00924
link 2024-03-13 11:06:59 -04:00
Joey Hess
406b5c6c10
fix spelling 2024-03-13 11:05:41 -04:00
Joey Hess
7044232696
todo 2024-03-13 11:04:06 -04:00
Joey Hess
e6fb0cdaad
update 2024-03-13 10:32:03 -04:00
Joey Hess
3877be35bd
update 2024-03-13 10:29:48 -04:00
Joey Hess
1dd4109bc8
Merge branch 'master' of ssh://git-annex.branchable.com 2024-03-13 10:19:17 -04:00
Joey Hess
259061c444
todo 2024-03-13 10:19:10 -04:00
Joey Hess
eaf451c129
thoughts 2024-03-12 16:41:25 -04:00
plattfot@2283a4f9dca7a5a94ba91f0c65c1fb52bb25e811
484483a699 2024-03-12 19:01:46 +00:00
Joey Hess
087e099e6a
Merge branch 'master' of ssh://git-annex.branchable.com 2024-03-11 10:00:48 -04:00
Joey Hess
e29918aea1
comment 2024-03-11 10:00:45 -04:00
Joey Hess
dd4c4bcd7a
fix build warning
A recent change made plumbing the backend through fsck unncessary.

Left fsck checking backend and skipping operating on key when it could
not find one, although I'm not sure if that's necessary to support eg,
keys with unknown backend.
2024-03-09 13:50:30 -04:00
Joey Hess
7cef5e8f35
export tree: avoid confusing output about renaming files
When a file in the export is renamed, and the remote's renameExport
returned Nothing, renaming to the temp file would first say it was
renaming, and appear to succeed, but actually what it did was delete the
file. Then renaming from the temp file would not do anything, since the
temp file is not present on the remote. This appeared as if a file got
renamed to a temp file and left there.

Note that exporttree=yes importree=yes remotes have their usual
renameExport replaced with one that returns Nothing. (For reasons
explained in Remote.Helper.ExportImport.) So this happened
even with remotes that support renameExport.

Fix by letting renameExport = Nothing when it's not supported at all.
This avoids displaying the rename.

Sponsored-by: Graham Spencer on Patreon
2024-03-09 13:50:26 -04:00
Joey Hess
0fb551053b
fix comment 2024-03-08 14:59:54 -04:00