Commit graph

38372 commits

Author SHA1 Message Date
Joey Hess
ccfa9b2dc4
make sync update --unlock-present branch 2020-11-13 15:04:34 -04:00
Joey Hess
e66b7d2e1b
rename to --unlock-present and better reverse adjusting
An --unlock-present branch reverses back to a branch where
all files that get modified or renamed become locked, even if they were
originally unlocked. This is the same that reversing a --unlock branch
works, and the new name makes that commonality more clear.
2020-11-13 14:56:43 -04:00
Joey Hess
3899e216af
Merge branch 'master' into symlink-missing 2020-11-13 14:19:45 -04:00
Joey Hess
a30030c4a6
move: Fix a regression in the last release that made move --to not honor numcopies settings
This commit was sponsored by Svenne Krap on Patreon.
2020-11-13 14:19:32 -04:00
Joey Hess
98d1cbd1ee
add a test case that move respects numcopies
There is already one for drop, but move and drop don't handle numcopies
exactly the same, and there was recently a reversion in it checking
numcopies properly at all.

This commit was sponsored by Noam Kremen on Patreon.
2020-11-13 14:06:57 -04:00
Joey Hess
c8e49c5ef5
git-annex adjust --lock-missing
Like --hide-missing the branch does not get updated when content
availability changes.

Seems to basically work, but sync does not update it yet.

Also, when a file is present and so unlocked, git mv followed by
git-annex sync results in the basis branch being updated to contain the
file with the new name, unlocked. This seems different than what
happens in an adjusted unlocked branch, where the commit propigates back
locked. Probably the reverse adjustment code needs to be improved to
handle this case.
2020-11-13 13:39:44 -04:00
Joey Hess
57bd0cf4e3
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-13 13:34:59 -04:00
Joey Hess
89a151608d
hush build warning on OSX 2020-11-13 13:34:34 -04:00
Joey Hess
ed7afabdb1
fix build on windows 2020-11-13 13:34:28 -04:00
kyle
eaeedfe0ca Added a comment 2020-11-13 16:36:46 +00:00
wting
d5aab420b5 2020-11-13 06:20:27 +00:00
Joey Hess
81f801c3b4
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-12 14:11:19 -04:00
Joey Hess
7566aa6bc5
examinekey: Added --migrate-to-backend
Note that, the way the SeekInput parser is written to support batch mode,
it's actually possible to do git-annex examinekey
"SHA1--foo foo.tar.gz" --migrate-to-backend=SHA1E

While that might be kind of useful to support multiple migrations not using
batch mode, I have not documented it. It would be better to take pairs of
key and file in that case.
2020-11-12 14:09:14 -04:00
kyle
bb6b3b1bcb 2020-11-12 17:13:55 +00:00
Joey Hess
12e32d1dee
examinekey: Added two new format variables: objectpath and objectpointer 2020-11-12 13:02:31 -04:00
Joey Hess
c5141b469a
comment 2020-11-12 12:59:27 -04:00
Joey Hess
b1eb47599a
move old direct mode stuff out of Annex.Locations 2020-11-12 12:40:35 -04:00
Joey Hess
d7da4ee00a
comment 2020-11-12 12:29:15 -04:00
Joey Hess
e370bbc021
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-12 11:39:47 -04:00
Joey Hess
f240f0196c
fix build on windows 2020-11-12 11:39:29 -04:00
Joey Hess
6441c4c177
fix build on OSX 2020-11-12 11:36:14 -04:00
yarikoptic
60a71f90cc adding a note pointing to tentative recipe 2020-11-11 20:10:33 +00:00
yarikoptic
07e9f43c63 todo/question on how to get full path to the key knowing metadata but having no file 2020-11-11 19:29:14 +00:00
Joey Hess
487f7f979e
bump filepath-bytestring dep 2020-11-11 11:49:19 -04:00
Joey Hess
15b75ef1b8
mixed up some of these long urls 2020-11-11 11:47:58 -04:00
Joey Hess
6911d27d42
fix build on windows 2020-11-11 08:51:42 -04:00
Joey Hess
326587a7d1
fix build on OSX more 2020-11-11 08:51:09 -04:00
Joey Hess
adcf95f3f2
updated github builds that datalad is doing 2020-11-11 08:50:18 -04:00
Joey Hess
9c9c74d824
update 2020-11-11 08:14:55 -04:00
Joey Hess
da80f75f3b
question 2020-11-11 07:53:42 -04:00
Joey Hess
bc1ac21885
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-10 12:15:04 -04:00
Joey Hess
92b7b1964d
add warning on add of annex link
Warn when adding a annex symlink or pointer file that uses a key that is
not known to the repository, to prevent confusion if the user has copied it
from some other repository.

This commit was sponsored by Jake Vosloo on Patreon.
2020-11-10 12:10:51 -04:00
jcjgraf
736a51112b Added a comment 2020-11-10 16:05:57 +00:00
Joey Hess
9e8eae20e2
comment 2020-11-10 11:53:45 -04:00
Joey Hess
4c1eb28c40
fix build on windows 2020-11-10 11:21:03 -04:00
Joey Hess
d22614d3db
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-10 11:16:56 -04:00
Joey Hess
278c672141
fix build on OSX 2020-11-10 11:16:39 -04:00
Joey Hess
c6604406b9
bump dep on filepath-bytestring
needed for makeRelative
2020-11-10 11:15:14 -04:00
jcjgraf
b05ba8aa5a Added a comment 2020-11-10 10:17:12 +00:00
Joey Hess
885974be99
add newtypes for QuickCheck to avoid LANG=C issues
All properties changed to use them, except for
prop_encode_c_decode_c_roundtrip, which already filtered to ascii
for other reasons.

A few modules had to be split out, because Setup does not build-depend
on QuickCheck.
2020-11-09 20:21:18 -04:00
Joey Hess
aad4129669
diagnosis 2020-11-09 19:10:41 -04:00
yarikoptic
098984574d fresh test failures + report that still there are FTBFS: I only wish git-annex development used some CI 2020-11-09 22:11:32 +00:00
Joey Hess
e81bb05b25
add debug in two unusual situations 2020-11-09 17:52:06 -04:00
Joey Hess
af9354f447
comment 2020-11-09 17:30:08 -04:00
jcjgraf
7e2b74d278 Added a comment 2020-11-09 20:41:00 +00:00
Joey Hess
0f28133778
followup 2020-11-09 15:45:39 -04:00
Joey Hess
cab33481c0
Merge branch 'master' of ssh://git-annex.branchable.com 2020-11-09 15:26:31 -04:00
Joey Hess
d032b0885d
use MatchingKey when a Key is known
This fixes a bug where a file that was not preferred content could be
transferred to a remote. This happened when the file got deleted after
the sync started running.

The only time checkMatcher is run without a Key is in calls to
checkFileMatcher, which are only done by add, addurl, import, and
smudge --clean. Those won't be affected by this kind of race. Anything
else that might be precaching and have a similar race as sync will also
be fixed, but I don't know if it actually affected anything other than
sync.

As well as fixing a bug, this also probably makes sync and --auto faster
by avoiding the redundant key lookup.

This commit was sponsored by Graham Spencer on Patreon.
2020-11-09 15:17:22 -04:00
Joey Hess
d84371ff73
reproduced 2020-11-09 14:35:51 -04:00
jcjgraf
3e12f5872a Added a comment 2020-11-09 18:13:47 +00:00