Commit graph

29248 commits

Author SHA1 Message Date
AlbertZeyer
3ceaf762b9 2021-01-03 22:02:02 +00:00
AlbertZeyer
29114d53d9 Added a comment 2021-01-03 21:48:51 +00:00
AlbertZeyer
d7bb4040d8 Added a comment 2021-01-02 23:49:14 +00:00
Joey Hess
ea95de3656
Merge branch 'master' of ssh://git-annex.branchable.com 2021-01-02 19:33:55 -04:00
AlbertZeyer
62f06649d7 Added a comment 2021-01-02 16:23:05 +00:00
Lukey
0a264f1c98 2021-01-02 15:28:02 +00:00
Lukey
7f11160002 Added a comment 2021-01-02 15:22:18 +00:00
Lukey
bd5c668118 Added a comment 2021-01-02 15:16:04 +00:00
Lukey
420e704955 Added a comment 2021-01-02 15:12:49 +00:00
Lukey
ed412d2406 Added a comment 2021-01-02 15:05:01 +00:00
AlbertZeyer
065cea3568 Added a comment 2021-01-01 22:30:34 +00:00
AlbertZeyer
90a026b33d Added a comment: Difference to import/add? 2021-01-01 21:49:29 +00:00
AlbertZeyer
754327b2c4 Added a comment: rename or move files 2021-01-01 21:33:41 +00:00
AlbertZeyer
62a6d40f1c Added a comment: Adding external files 2021-01-01 21:30:38 +00:00
AlbertZeyer
c7bcc32e37 Added a comment: annex.largefiles 2021-01-01 21:25:44 +00:00
Lukey
497d45d04c 2021-01-01 15:43:43 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
f972c5c132 Added a comment 2021-01-01 04:08:44 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
c7939d226e Added a comment 2020-12-31 22:45:03 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
31eef3d213 Added a comment 2020-12-31 22:05:19 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
cc1e8897e6 Added a comment 2020-12-31 22:00:08 +00:00
Lukey
89ac4e68bb Added a comment 2020-12-31 21:46:33 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
e82bbb09a2 Added a comment 2020-12-31 20:51:12 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
6e467a3807 Added a comment 2020-12-31 20:34:55 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
073cdd6227 removed 2020-12-31 19:41:18 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
3643705e2e Added a comment 2020-12-31 19:40:22 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
82b4916c31 Added a comment 2020-12-31 19:40:01 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
861b3b3088 Added a comment 2020-12-31 19:34:56 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
935f8991cb Added a comment 2020-12-31 18:55:30 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
50b200b5e0 2020-12-31 18:51:50 +00:00
Joey Hess
13a1d6eb17
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-31 13:46:25 -04:00
Lukey
5826c713db Added a comment 2020-12-31 17:32:47 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
2a9eb6609c 2020-12-31 16:58:50 +00:00
Joey Hess
9a3998392e
close import_tree todo
Split out two todos for things that were mentioned as still open items
in there. Most of the others were already dealt with. I didn't open a
new todo for the import from readonly S3 bucket because I guess if
someone needs that, they can ask for it.
2020-12-30 13:40:49 -04:00
Joey Hess
cefbfc678d
document what importKey returning Nothing does
That was added for thirdpartypopulated remotes, but for others it also
has the effect of skipping including the file in the imported tree.
2020-12-30 13:23:16 -04:00
Lukey
c88008beca Added a comment 2020-12-29 23:30:47 +00:00
Joey Hess
92900cb71a
add news item for git-annex 8.20201129 2020-12-29 13:52:34 -04:00
Joey Hess
142be24334
update 2020-12-29 12:52:55 -04:00
Joey Hess
70a05c76d3
close 2020-12-29 12:48:21 -04:00
Joey Hess
4f64c08f32
improve tip 2020-12-28 19:38:12 -04:00
Joey Hess
4262ba3c44
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-28 17:05:00 -04:00
Joey Hess
94b3b8f2d9
update 2020-12-28 17:04:41 -04:00
Joey Hess
d95f647572
tip for probably best use case for borg with git-annex 2020-12-28 17:02:39 -04:00
Joey Hess
b16e6fb4e6
borg appendonly config 2020-12-28 16:23:38 -04:00
gb@4a49bb1afcf3d183bba8f07297b0395808768c6c
1ff6499878 Bug report: annex.adjustedbranchrefresh ignored 2020-12-28 20:03:34 +00:00
AlbertZeyer
5f99217626 2020-12-28 16:31:09 +00:00
AlbertZeyer
4593f002b7 2020-12-28 16:02:24 +00:00
AlbertZeyer
268df65516 2020-12-28 15:50:54 +00:00
AlbertZeyer
5765a9cbc0 2020-12-28 15:46:52 +00:00
AlbertZeyer
b1cd6981f5 2020-12-28 15:33:08 +00:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
a83f6075ec removed 2020-12-23 19:57:49 +00:00
Joey Hess
6280af2901
generate more compact git-annex branch for imports
Especially from borg, where the content identifier logs
all end up being the same identical file!

But also, for other imports, the location tracking logs can,
in some cases, be identical files.

Bonus optimisation: Avoid looking up (and parsing when set)
GIT_ANNEX_VECTOR_CLOCK env var every time a log is written to.
Although the lookup does happen at startup even when no
log will be written now.
2020-12-23 15:25:16 -04:00
Joey Hess
7916fc98a3
graft in imported tree to avoid gc
Fix a bug that could prevent getting files from an importtree=yes remote,
because the imported tree was allowed to be garbage collected.
2020-12-23 14:27:38 -04:00
Joey Hess
c6e693b25d
remove ContentIndentifiersCidRemoteIndex uniqueness constraint
For reasons explained in the bug report.

Implemented using a persistent migration, which works fine. It may add a
little startup overhead when a remote is enabled that uses this, but
probably un-noticable.

On the next major version, it would be fine to delete this database,
and regenerate it from the git-annex branch information. Then this
change could be reverted.

Did nothing about adding back the data that got dropped from the db
due to the bug. Only the borg special remote was probably affected,
and it's not been released yet. rm -rf .git/annex/cidsdb does work.
2020-12-23 14:03:33 -04:00
Joey Hess
b370e6b0ad
bug 2020-12-23 13:41:02 -04:00
Joey Hess
e3d356fe84
borg: add subdir= config
Note that, after changing it with enableremote, syncing won't rescan
known archives in the borg repo using the changed config. Probably not a
problem?

Also used File in some places where filenames that could theoretically
start with - are passed to borg, to avoid it confusing them with
options.
2020-12-23 13:12:11 -04:00
Joey Hess
1574972ba9
make sync --content get from third-party populated remotes like borg 2020-12-23 12:10:39 -04:00
Joey Hess
d239a55bd1
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-22 16:55:15 -04:00
Joey Hess
91624f918d
devblog 2020-12-22 16:53:40 -04:00
Joey Hess
79729bcd76
todo 2020-12-22 16:37:19 -04:00
Joey Hess
a2fe994ebb
move unimplemented option to todo 2020-12-22 16:28:13 -04:00
Joey Hess
cd4c68924b
merged borg
Still a couple related todos, but it's basically usable now.
2020-12-22 16:22:44 -04:00
Joey Hess
310d3c3823
Merge branch 'borg' 2020-12-22 16:19:32 -04:00
Joey Hess
2335476e1e
todo 2020-12-22 16:19:02 -04:00
Joey Hess
4254e2297d
implement retrieveExportWithContentIdentifier
Moved out an XXX to a todo

This seems about ready to merge..
2020-12-22 16:16:48 -04:00
Joey Hess
f31bdd0b19
todo 2020-12-22 15:01:07 -04:00
Joey Hess
82e43da936
todo 2020-12-22 15:00:11 -04:00
Joey Hess
4f9969d0a1
optimisation for borg
Skip needing to list importable contents when unchanged since last time.
2020-12-22 15:00:05 -04:00
Joey Hess
c2d6f335a6
notes on ImportableContents history not being used for retrieval 2020-12-22 11:24:11 -04:00
eric.w@eee65cd362d995ced72640c7cfae388ae93a4234
ce740fb22e 2020-12-21 20:59:21 +00:00
jkniiv
21302c00ef Added a comment: well done! 2020-12-21 18:14:26 +00:00
amerlyq+annex@12121d70a602f094228689a0a24d348d478a8af1
825ff92a40 Added a comment: "mirror" workflow: usage of "wanted" expression is inconsistent with regular annex remote 2020-12-21 07:34:28 +00:00
amerlyq+annex@12121d70a602f094228689a0a24d348d478a8af1
f0490ebad1 Added a comment: adb special remote 2020-12-21 06:36:33 +00:00
Joey Hess
bd7b85371f
bug report 2020-12-20 16:27:32 -04:00
dzhu
9fffe46b0d 2020-12-19 23:05:32 +00:00
Joey Hess
3207e8293b
start borg special remote
Compiles, but unusable so far.
2020-12-18 16:03:51 -04:00
Joey Hess
909318dcee
Merge branch 'master' into borg 2020-12-18 15:27:24 -04:00
Joey Hess
e998320318
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-18 15:14:10 -04:00
Joey Hess
f62aee0525
fix handling of importtree-only remotes
Don't want to try to use these remotes as key/value remotes, which will
surely fail. It only recently became possible for importtree to be set
w/o exporttree, so before this code was ok.

(cherry picked from commit 97599cb0f7f4115aa5a3e81a91ee3d1d6c52dc84)
2020-12-18 15:13:30 -04:00
Joey Hess
037f8b6863
update 2020-12-18 11:06:23 -04:00
Ilya_Shlyakhter
738d919df3 Added a comment: encryption=onlycreds 2020-12-17 21:01:33 +00:00
Joey Hess
f0a495fa05
Merge branch 'master' into borg 2020-12-17 16:36:15 -04:00
Joey Hess
e5ef8aea9a
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-17 16:35:10 -04:00
Joey Hess
4c63cab467
todo 2020-12-17 16:30:51 -04:00
kyle
48da7e002d Added a comment 2020-12-17 19:05:13 +00:00
dscheffy@c203b7661ec8c1ebd53e52627c84536c5f0c9026
c53057caa3 Added a comment 2020-12-17 18:14:16 +00:00
kyle
49c4d471ff Added a comment 2020-12-17 17:41:36 +00:00
Joey Hess
ef8c36254a
docs for borg special remote
(which DNE yet)
2020-12-17 13:12:35 -04:00
Joey Hess
e9af56fef1
typo 2020-12-17 12:53:47 -04:00
Joey Hess
53fd1564b1
improve synopsis 2020-12-17 12:51:49 -04:00
Joey Hess
7c7486a45f
response 2020-12-17 12:47:07 -04:00
Joey Hess
c52550a6a8
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-17 12:45:07 -04:00
Joey Hess
00352ebe37
man page improvement 2020-12-17 12:17:58 -04:00
kyle
54dc20fb74 Added a comment 2020-12-17 16:06:44 +00:00
dscheffy@c203b7661ec8c1ebd53e52627c84536c5f0c9026
3f95fa2a3a Added a comment: How do I man annex config options? 2020-12-17 10:39:40 +00:00
dscheffy@c203b7661ec8c1ebd53e52627c84536c5f0c9026
a2d5fd0aa6 2020-12-16 18:53:21 +00:00
dscheffy@c203b7661ec8c1ebd53e52627c84536c5f0c9026
05ee618d11 Added a comment: Duplicate content creates frustrating cycles 2020-12-16 17:10:52 +00:00
jwodder
cf43362cae Add post metadata 2020-12-16 16:03:55 +00:00
jwodder
ad180cedc7 2020-12-16 16:03:04 +00:00
Joey Hess
2abda21123
update 2020-12-15 16:35:06 -04:00
Joey Hess
117d270bb4
comment 2020-12-15 16:34:16 -04:00
Joey Hess
f29d49d478
check Remote.hasKeyCheap again
In cd1676d604, it stopped using that to avoid surprising behavior
when the location log and remote content were out of sync.
But, it seems that may have changed some behavior users relied on as
well, and also Remote.hasKeyCheap should be faster than checking then
location log.

So, try Remote.hasKeyCheap first, and only if it does not have the key,
fall back to checking the location log. If the location log still thinks
it's present, go ahead and try to get it, so the user will see a failure
rather than silently skipping a file what whereis says is on the remote.

This does make slightly slower the case where the remote does not have
the key, and location log and Remote.hasKeyCheap agree, since it now
checks both. But only 1 stat slower.
2020-12-15 14:44:00 -04:00
Joey Hess
c2a5f3c44f
followup 2020-12-15 14:05:54 -04:00
Joey Hess
3d49e16a10
comment 2020-12-15 13:21:15 -04:00
Joey Hess
4c1461932f
comment 2020-12-15 13:17:31 -04:00
Joey Hess
4488bbd540
response 2020-12-15 13:03:06 -04:00
Joey Hess
5ae0e07ad0
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-15 12:40:07 -04:00
Joey Hess
6b13574827
Windows: include= and exclude= containing '/' will also match filenames that are written using '\'
And vice-versa, but it's better to use '/' for portability.

Notably, standardPreferredContent contains "archive/*" and that might not
match if the filename ends up coming in with the slashes the other way
around.
2020-12-15 12:39:34 -04:00
yarikoptic
07b8dc4a8b Added a comment 2020-12-15 16:18:39 +00:00
Joey Hess
e914cb0777
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-15 12:12:29 -04:00
Joey Hess
6c890d62f6
initremote: Prevent enabling encryption with exporttree=yes/importtree=yes
I do think this was a reversion, but I have not tracked back to what
version. While involving the remote config, it's not the same class of
problems that I kept having to chase down for a while after the remote
config parser reworking.
2020-12-15 12:08:08 -04:00
Joey Hess
74c1e0660b
propagate git-annex -c on to transferrer child process
git -c was already propagated via environment, but need this for
consistency.

Also, notice it does not use gitAnnexChildProcess to run the
transferrer. So nothing is done about avoid it taking the
pid lock. It's possible that the caller is already doing something that
took the pid lock, and if so, the transferrer will certianly fail,
since it needs to take the pid lock too. This may prevent combining
annex.stalldetection with annex.pidlock, but I have not verified it's
really a problem. If it was, it seems git-annex would have to take
the pid lock when starting a transferrer, and hold it until shutdown,
or would need to take pid lock when starting to use a transferrer,
and hold it until done with a transfer and then drop it. The latter
would require starting the transferrer with pid locking disabled for the
child process, so assumes that the transferrer does not do anyting that
needs locking when not running a transfer.
2020-12-15 11:36:25 -04:00
bb02f2c1-f8f2-4781-8655-e819a0d08f20@d25da75868bc96920418ffd199264ca9d07e0de2
5699513089 Editing files in tag / view branch 2020-12-15 07:26:18 +00:00
jkniiv
8bfc2bbe0a Added a comment: yay, it's working now! :) 2020-12-15 04:46:38 +00:00
Joey Hess
8b248d84fb
comment 2020-12-14 17:43:48 -04:00
Joey Hess
9244874304
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-14 17:42:25 -04:00
Joey Hess
01527b21d8
add key to FileInfo
MatchingKey is not the thing to use when matching on actual worktreee
files.

Fix reversion in 8.20201116 that made include= and exclude= in
preferred/required content expressions match a path relative to the current
directory, rather than the path from the top of the repository.
2020-12-14 17:42:02 -04:00
yarikoptic
65ab8a2163 Added a comment 2020-12-14 20:59:06 +00:00
Joey Hess
fac5ccb2e2
add USE_SYSTEM_LIBS=1 for osxapp build 2020-12-14 15:34:27 -04:00
Joey Hess
9da06e1f75
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-14 14:59:03 -04:00
Joey Hess
75acf5f440
improve some edge cases around partial initialization
* Guard against running in a repo where annex.uuid is set but
  annex.version is set, or vice-versa.
* Avoid autoinit when a repo does not have annex.version or annex.uuid
  set, but has a git-annex objects directory, suggesting it was used
  by git-annex before.
2020-12-14 13:17:43 -04:00
yarikoptic
ef55021fe1 Added a comment 2020-12-14 14:07:47 +00:00
jkniiv
ec1202871d 2020-12-14 05:07:20 +00:00
Joey Hess
9aaab02e44
add 2020-12-13 18:50:35 -04:00
adina.wagner@2a4cac6443aada2bd2a329b8a33f4a7b87cc8eff
5a4aa4ae0c Added a comment 2020-12-12 20:32:05 +00:00
muks@6bded6d879d80c43cdf4893fabb785876eea0a7b
0e8cf6a1e9 Added a comment 2020-12-12 10:35:07 +00:00
Joey Hess
5c7392b942
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-11 18:31:09 -04:00
Joey Hess
3e608dfc13
mention annex.stalldetection and don't recommend too infrequent progress updates 2020-12-11 18:26:24 -04:00
kyle
c3e0856b45 Added a comment 2020-12-11 20:56:04 +00:00
Joey Hess
3c76a31b15
response and related todo 2020-12-11 16:21:16 -04:00
Joey Hess
e6692b66f1
remove
I need to think about this some more, not clear if it's a todo
item specific to stalldetection at all. Remotes with this behavior
also show no progress when run with -J. And some other remotes don't
update any progress meters at all, eg adb is that way and so are hook
remotes and of course external remotes don't have to send progress info.
2020-12-11 15:49:39 -04:00
Joey Hess
fadf47557f
note 2020-12-11 15:48:03 -04:00
Joey Hess
90eadbce49
close 2020-12-11 15:45:55 -04:00
Joey Hess
d3f78da0ed
propagate signals to the transferrer process group
Done on unix, could not implement it on windows quite.

The signal library gets part of the way needed for windows.
But I had to open https://github.com/pmlodawski/signal/issues/1 because
it lacks raiseSignal.

Also, I don't know what the equivilant of getProcessGroupIDOf is on
windows. And System.Process does not provide a way to send any signal to
a process group except for SIGINT.

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2020-12-11 15:32:00 -04:00
Joey Hess
79c765b727
meant to close this earlier 2020-12-11 14:25:54 -04:00
Joey Hess
e1cf8bd35c
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-11 12:53:14 -04:00
Joey Hess
095cdc7e83
extend transferrer protocol to send progress bar total size updates
New protocol is not back-compat with old one, but it's never been
released so that's ok.
2020-12-11 12:42:28 -04:00
Joey Hess
263fd1d459
ugh 2020-12-11 11:51:46 -04:00
Joey Hess
a422a056f2
make getViaTmpFrom no longer update location log
All callers adjusted to update it themselves.

In Command.ReKey, and Command.SetKey, the cleanup action already did,
so it was updating the log twice before.

This fixes a bug when annex.stalldetection is set, as now
Command.Transferrer can skip updating the location log, and let it be
updated by the calling process.
2020-12-11 11:50:13 -04:00
kyle
e0780877d7 Added a comment 2020-12-11 15:29:26 +00:00
Joey Hess
a6ed23b82f
todo 2020-12-11 11:09:19 -04:00
muks@6bded6d879d80c43cdf4893fabb785876eea0a7b
16f2fcd778 Added a comment 2020-12-11 02:18:30 +00:00
muks@6bded6d879d80c43cdf4893fabb785876eea0a7b
cf4a669d86 2020-12-11 01:56:38 +00:00
yarikoptic
e0965b831c Added a comment 2020-12-10 21:55:20 +00:00
Joey Hess
108c7d96dd
comment 2020-12-10 17:52:26 -04:00
Joey Hess
8c0ff6b8cd
Merge branch 'master' of ssh://git-annex.branchable.com 2020-12-10 17:47:22 -04:00
Joey Hess
d3c11eac5d
2 bugs involving new stalldetection feature 2020-12-10 17:46:58 -04:00
yarikoptic
c2071567ca Initial report on export -J6 to S3 failing due to "transfer already in progress" 2020-12-10 21:16:56 +00:00
Joey Hess
38e0e2e471
bug 2020-12-10 13:09:57 -04:00
anarcat
6b3880b539 2020-12-10 15:53:37 +00:00
Joey Hess
714e665c92
reorg 2020-12-10 11:25:02 -04:00