Commit graph

28990 commits

Author SHA1 Message Date
Joey Hess
62372ee052
resolvemerge: Improve cleanup of cruft left in the working tree by a conflicted merge
This commit was sponsored by Jake Vosloo on Patreon.
2020-09-07 16:50:27 -04:00
Joey Hess
03dee56546
revert change that broke test suite
Opened a new bug about it.

This commit was sponsored by Ethan Aubin.
2020-09-07 15:42:38 -04:00
Joey Hess
0389a22be3
devblog 2020-09-07 15:12:03 -04:00
Joey Hess
d120c73302
sync, assistant: When merge.directoryRenames is not set, default it it to "false"
Works better with automatic merge conflict resolution than git's ususual
default of "conflict".

This is not done when automatic merge conflict resolution is disabled.

This commit was sponsored by Mark Reidenbach on Patreon.
2020-09-07 13:50:58 -04:00
Joey Hess
69053a93a2
resolvemerge: Improve cleanup of files that were deleted by one side of a conflicted merge, and modified by the other side
This case was handled by cleanConflictCruft, but only when the annexed
file's object was present. When not present, it left the annexed file
with the original name, not checked into git, while adding the variant
file. So, add an explicit deletion of the deleted file in this case.

My specific case where this happened actually involves
merge.directoryRenames=conflict. After a merge involving that,
the situation was the file appears as "added by them", because that
caused the file that they added to be moved into a directory we renamed.

That case is the same as them adding a modified version of the file,
while we deleted it. (Except for the history of the file, since it's a
new file, but this doesn't look at history.)

This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
2020-09-07 12:25:57 -04:00
Joey Hess
a360437215
make automerge behavior when one side deleted explict
This does not actually change how the merge conflict is resolved when
one side deleted the file, but it was not documented before, and I think
it only worked by accident.

This commit was sponsored by Brett Eisenberg on Patreon.
2020-09-07 12:01:03 -04:00
Joey Hess
13fdba133f
more 2020-09-06 10:51:23 -04:00
Joey Hess
842afa71ab
bug 2020-09-06 10:42:19 -04:00
Joey Hess
45daa931ed
update 2020-09-05 11:36:47 -04:00
Joey Hess
e36bae74da
Exposed annex.forward-retry git config
One reason is, 5 is an arbitrary number so ought to be configurable.

The real reason though, is I wanted to make the man page explain when
forward retry can override annex.retry, and having a config made the
man page easier to write.
2020-09-04 15:16:40 -04:00
Joey Hess
2bb933eb60
import: Retry downloads that fail
Also, using the transfer machinery for this makes eg, git-annex info show
in-progress imports, and makes --notify-start/finish work.
2020-09-04 13:54:05 -04:00
Joey Hess
46eb48d7c0
Retry transfers to exporttree=yes remotes same as for other remotes
The comment about noRetry is not well-justified, because transfers to many
remotes cannot be resumed, but retries are still allowed for those.
2020-09-04 13:24:08 -04:00
Joey Hess
1d244bafbd
Limit retrying of failed transfers when forward progress is being made to 5
To avoid some unusual edge cases where too much retrying could result in
far more data transfer than makes sense.
2020-09-04 12:46:37 -04:00
Joey Hess
6e9a4f50f3
make viaTmp honor umask
Fixed several cases where files were created without file mode bits that
the umask would usually set. This included exports to the directory special
remote, torrent files used by the bittorrent special remote, hooks written
by git-annex init, and some log files in .git/annex/

Audited all calls, looking for ones that didn't want the umask bits to be
set. All such turned out to already set the specific restrictive file mode
they wanted.
2020-09-02 14:54:07 -04:00
Joey Hess
eed20fe3b7
fix some file modes in calls to withTmpFileIn to honor umask
Also audited for other calls to openTempFile, and all are ok,
except for viaTmp which will need further work.

Remote.Directory fixed to set umask mode when writing to an export,
although it has another one using viaTmp that's not fixed.
Will make exports that are published via a http server running as
another user work, for example.

Remote.BitTorrent fixed to set umask mode when downloading the torrent
file. Normally this does not matter as that file does not hang around
after the download, but if a bittorrent download were started by one user,
got interrupted and then another user ran it, this will let them access
the torrent file created by the first user.
2020-09-02 14:36:08 -04:00
Joey Hess
5a9f518a42
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-09-02 12:25:52 -04:00
Joey Hess
6781be2141
bug report 2020-09-02 12:25:27 -04:00
kyle
94c4da582d fix example: meant to prune --force and include rest of output 2020-09-02 15:51:49 +00:00
Ilya_Shlyakhter
1a6a73eeac Added a comment: verifying source contents 2020-09-02 15:35:22 +00:00
Joey Hess
854cd2ad47
httpalso: support exporttree=yes
Also tested what happens if the other special remote has importtree=yes
and exporttree=yes, and in that case, download via httpalso works too,
without needing to implement any importtree methods here.

It might be possible to make it automatically set exporttree=yes if the
--sameas does. Didn't try, will probably be layering issues.

Or perhaps it should be inherited by sameas like some
other configs? But then, wouldn't it also make sense to inherit
importree=yes? But as shown here, it's not needed by this kind of
remote.
2020-09-02 11:26:00 -04:00
Joey Hess
8656afd3e1
rename http special remote to httpalso
"http" was too generic and easy to confuse with web. The new name makes
clear it's used in addition to some other remote. And other protocols
can use the same naming scheme.
2020-09-02 10:41:53 -04:00
kyle
2225c69fa2 content verification before transfer to special remote 2020-09-02 14:02:37 +00:00
hans.ekbrand@aabd6f2f1f93eab77ef85618d24892ebafc6e20f
6c2db1415a 2020-09-02 13:11:03 +00:00
hans.ekbrand@aabd6f2f1f93eab77ef85618d24892ebafc6e20f
5384b70bde 2020-09-02 13:10:31 +00:00
hans.ekbrand@aabd6f2f1f93eab77ef85618d24892ebafc6e20f
b16725a377 2020-09-02 13:09:04 +00:00
yarikoptic
03cea49042 Added a comment 2020-09-02 02:53:23 +00:00
yarikoptic
871257ee23 Added a comment 2020-09-01 20:50:02 +00:00
Joey Hess
20b06266d1
thought 2020-09-01 16:04:40 -04:00
Joey Hess
48dde6d5b0
link 2020-09-01 16:02:03 -04:00
Joey Hess
4bcfd56902
todo 2020-09-01 16:00:49 -04:00
Joey Hess
955f309cd5
comment 2020-09-01 15:51:41 -04:00
Joey Hess
d80876920f
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-09-01 15:36:56 -04:00
Joey Hess
5b177317b4
comment 2020-09-01 15:36:28 -04:00
yarikoptic
a70260160f noise about 500s 2020-09-01 19:29:29 +00:00
Joey Hess
dc45fc39e8
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-09-01 15:18:42 -04:00
Joey Hess
571ec900ac
Added http special remote, which is useful for accessing other remotes that publish content stored in them via http/https.
With automatic layout learning!
2020-09-01 15:16:35 -04:00
Joey Hess
fccc9ab442
note common need of these two todos 2020-09-01 12:13:41 -04:00
Joey Hess
d91b2b9fe2
close as dup 2020-09-01 11:58:08 -04:00
gb@4a49bb1afcf3d183bba8f07297b0395808768c6c
778e103632 2020-08-31 14:46:21 +00:00
gb@4a49bb1afcf3d183bba8f07297b0395808768c6c
358a20c5a0 2020-08-30 16:50:45 +00:00
falsifian
55c156a533 Update name of attribute in haskellPackages. 2020-08-28 21:52:18 +00:00
Joey Hess
41ebed3941
Support git remotes where .git is a file, not a directory
Eg when --separate-git-dir was used, and core.symlinks=false.

This commit was sponsored by Brock Spratlen on Patreon.
2020-08-28 15:08:14 -04:00
Joey Hess
cde3e5eb0c
test: Stop gpg-agent daemons that are started for the test framework's gpg key
They normally shutdown when the GNUPGHOME directory is deleted, but on
NFS they keep the directory from being deleted. And also, this avoids
a number of them piling up while the test suite is running.
2020-08-28 14:28:42 -04:00
Joey Hess
be42e04aa8
close 2020-08-28 13:55:54 -04:00
Joey Hess
6bdfeea3b1
close 2020-08-28 13:54:42 -04:00
Joey Hess
5eceef899a
close 2020-08-28 13:53:15 -04:00
jcohen@8a78f6f9e293f581b96cd43634328c0e9de6b36e
c1d93e8395 2020-08-28 02:12:57 +00:00
jcohen@8a78f6f9e293f581b96cd43634328c0e9de6b36e
c30fc9e7e1 2020-08-28 02:12:15 +00:00
Ilya_Shlyakhter
b46776917d Added a comment 2020-08-28 01:02:50 +00:00
cardoso-neto
2d1b198420 Added a comment 2020-08-28 00:20:31 +00:00
Ilya_Shlyakhter
22dc07e68f Added a comment: understanding why standalone conda package gets preferred 2020-08-27 15:32:09 +00:00
Joey Hess
02a35c9cee
comment 2020-08-26 13:09:47 -04:00
Joey Hess
5c1b91f8d3
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-08-26 13:06:14 -04:00
Joey Hess
b68f214312
Display a message when git-annex has to wait for a pid lock file held by another process 2020-08-26 13:05:34 -04:00
yarikoptic
a325beef64 Added a comment: dreaming of everyone using CoW FSs 2020-08-26 01:26:29 +00:00
Joey Hess
6547bfe324
comment 2020-08-25 17:43:50 -04:00
Joey Hess
7bdb0cdc0d
add gitAnnexChildProcess and use instead of incorrect use of runsGitAnnexChildProcess
Fixes reversion in 8.20200617 that made annex.pidlock being enabled result
in some commands stalling, particularly those needing to autoinit.

Renamed runsGitAnnexChildProcess to make clearer where it should be
used.

Arguably, it would be better to have a way to make any process git-annex
runs have the env var set. But then it would need to take the pid lock
when running any and all processes, and that would be a problem when
git-annex runs two processes concurrently. So, I'm left doing it ad-hoc
in places where git-annex really does run a child process, directly
or indirectly via a particular git command.
2020-08-25 14:57:49 -04:00
Joey Hess
348eaf7b6c
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-08-25 14:31:43 -04:00
Joey Hess
ca3fb4b1d2
analysis 2020-08-25 14:31:15 -04:00
kyle
6363b888af Added a comment 2020-08-25 17:51:43 +00:00
Joey Hess
d3f3e8f587
document that annex.thin beats annex.hardlink 2020-08-25 13:34:37 -04:00
Joey Hess
2ab574a72f
Merge branch 'master' of ssh://git-annex.branchable.com into master 2020-08-25 13:01:03 -04:00
Joey Hess
2ca1ff62dc
addurl --file youtube-dl reversion fix
addurl: Fix reversion in 7.20190322 that made --file not be honored when
youtube-dl was used to download media.

8758f9c561 was on the right track, but missed that | otherwise prevented
the code it added from being used.

Also, refactored out a common function.

This commit was sponsored by Graham Spencer on Patreon.
2020-08-25 12:56:45 -04:00
yarikoptic
4daf4ea06f Added a comment: pidlock to blame! 2020-08-25 16:27:11 +00:00
kyle
d20ab86b41 Added a comment 2020-08-25 15:20:46 +00:00
yarikoptic
9ae3c552ed initial report on hardlink in thin mode 2020-08-25 15:07:21 +00:00
kyle
b60723184d Added a comment: comment: works on my end 2020-08-25 15:02:45 +00:00
yarikoptic
c8e9db9fdc Added a comment 2020-08-25 15:01:19 +00:00
yarikoptic
b04378ea6a initial report on get being stuck 2020-08-25 14:47:38 +00:00
yarikoptic
29402dd78b initial report on gpgtmp .nfs busy files 2020-08-25 03:12:16 +00:00
Joey Hess
27329f0bb1
stack.yaml: Updated to lts-16.10
Needs stack version 2.3 to build, which has only recently made it into
debian unstable.

This commit was sponsored by Jake Vosloo on Patreon.
2020-08-24 14:11:37 -04:00
kyle
335aae2668 Added a comment 2020-08-20 20:34:26 +00:00
cardoso-neto
1fd55a89c7 Added a comment 2020-08-20 20:08:07 +00:00
cardoso-neto
c550663512 Added a comment: Rationale behind deleting and readding the symlinks on a move or rename 2020-08-20 18:36:47 +00:00
kyle
aab3a552f9 Added a comment: thanks 2020-08-19 17:54:11 +00:00
Joey Hess
d00ce82418
fix hang if external program is not available
startExternal' throws an exception, which left the externalAsync TMVar
empty, so the next try to use it would hang.
2020-08-19 12:20:07 -04:00
kyle
ce59265a61 2020-08-18 17:44:01 +00:00
gitannex@56d80e101087518fccc08f4420216c4f61f80b7f
67cad93f82 2020-08-18 15:10:33 +00:00
michal.kotowski1@1c7e62558e00f6965c27223d9dcff021fbc44eed
1740c4ef65 2020-08-15 19:01:57 +00:00
Joey Hess
653652fdde
Merge branch 'master' of ssh://git-annex.branchable.com 2020-08-14 16:01:39 -04:00
Joey Hess
95d9a3cf8a
Merge branch 'asyncexternal' 2020-08-14 16:00:49 -04:00
Joey Hess
05b2b46a82
async extension done 2020-08-14 15:24:34 -04:00
cardoso-neto
5a24dbc96e Added a comment: Having cutting edge packages with conda is not that straighforward. 2020-08-14 18:55:18 +00:00
Joey Hess
198b709561
switch to TMVars for thread safety when using the async extension
TVars were not updated atomically, which was ok when each thread got its
own External that was the only thing using these TVars. But, with the
async extension, several External instances can share the same var, so
it needs to be a TMVar to avoid read/write conflicts.

In particular, this makes PREPARE only be sent once.
2020-08-14 14:50:09 -04:00
Joey Hess
7da2d4dd2d
one jobid per thread
And, relay ERROR on to all listening threads.
2020-08-14 14:24:46 -04:00
Ilya_Shlyakhter
935b10d32d Added a comment 2020-08-14 02:59:12 +00:00
Joey Hess
72561563d9
rethought the async protocol some more
Moving jobid generation to the git-annex side lets it be simplified a
lot.

Note that it will also be possible to generate one jobid per connection,
rather than a new job per request. That will make overflow not an issue,
and will avoid some work, and will simplify some of the code.
2020-08-13 20:18:06 -04:00
cardoso-neto
9932a13ff9 Added a comment: Ugly message when installing git-annex through conda 2020-08-14 00:08:29 +00:00
Joey Hess
7546e686a2
async proto basically working
Simplified the protocol by removing END-ASYNC.

There's a STM crash when a non-async protocol message is sent, which
needs to be fixed.
2020-08-13 15:52:12 -04:00
Joey Hess
0900bb2ca9
Merge branch 'master' of ssh://git-annex.branchable.com 2020-08-12 16:27:40 -04:00
Joey Hess
1ecbac4025
branch 2020-08-12 16:27:02 -04:00
Joey Hess
15706e6991
relayer receive loop is done
Receive loop looks right. Still need the send loop.

And, a complication is that some messages git-annex
sends need to be wrapped in REPLY_ASYNC, while others
do not. So will probably need to split externalSend
into two.
2020-08-12 15:56:58 -04:00
Joey Hess
7a21492f49
rethought this protocol again
Now that I've started implementation, I see it's really necessary that
every message the special remote sends use the protocol, otherwise
nasty edge cases abound.
2020-08-12 15:12:09 -04:00
git-annex@32dadd8082caa7c4ec9b28cf7dcf78e0d9fe58a8
c68bf6fc90 Bug: addurl --file not working as expected with youtube-dl 2020-08-12 13:09:02 +00:00
raf@4b53f20230978a98fc814b6e5565d9a30567a4f8
7be4eb71f2 removed 2020-08-12 12:54:46 +00:00
raf@4b53f20230978a98fc814b6e5565d9a30567a4f8
928787af63 2020-08-12 12:47:19 +00:00
cardoso-neto
2e5fe87ef0 Added a comment 2020-08-11 22:10:27 +00:00
Joey Hess
482422b9c5
Merge branch 'master' of ssh://git-annex.branchable.com 2020-08-11 16:42:37 -04:00
Joey Hess
ddf69bf5b8
draft async extension 2020-08-11 16:42:09 -04:00
cardoso-neto
d79bb64ea4 2020-08-11 20:23:25 +00:00
Ilya_Shlyakhter
14bbf17bb5 Added a comment: strange conda install behavior 2020-08-11 20:19:49 +00:00
cardoso-neto
46ca795432 Added a comment 2020-08-11 19:57:06 +00:00
Joey Hess
db1c6da84b
close 2020-08-11 14:01:22 -04:00
Ilya_Shlyakhter
b41f774451 added note on installing the standalone git-annex distribution with conda 2020-08-11 16:03:40 +00:00
Ilya_Shlyakhter
2df83e0511 Added a comment: checking the conda-forge recipe 2020-08-11 15:51:28 +00:00
cardoso-neto
1518e15123 Added a comment: Great tip about conda. 2020-08-11 13:23:00 +00:00
Ilya_Shlyakhter
042714fed7 Added a comment: please keep the hackage tarballs 2020-08-11 00:43:51 +00:00
Joey Hess
766a501fa1
add news item for git-annex 8.20200810 2020-08-10 19:22:55 -04:00
Joey Hess
3400b01887
comment 2020-08-10 18:46:44 -04:00
Ilya_Shlyakhter
693f2093a0 Added a comment 2020-08-10 21:52:32 +00:00
kyle
a186c4a4c4 Added a comment 2020-08-10 21:34:46 +00:00
Ilya_Shlyakhter
3b573c3735 Added a comment: full source tarballs for specific releases? 2020-08-10 21:14:05 +00:00
Joey Hess
c59a51a065
discard any exception thrown while trying to kill worker threads
Since there's a race here, and since Kyle saw an exception leak out,
which I have not been able to reproduce that. See my comment for what
I think might be going on.

Note that, I used tryNonAsync, because it seems a later tryNonAsync
caught the exception. I don't actually understand how it did, as I
understand exception classification, it's the data type, not the way it
was thrown. One possibility is that the async exception may have been wrapped
in some other, non-async exception, and Show displayed it the same way.
2020-08-10 16:24:51 -04:00
Joey Hess
0da4150453
Merge branch 'master' of ssh://git-annex.branchable.com 2020-08-10 16:03:59 -04:00
Joey Hess
d48049bdd8
comment 2020-08-10 16:03:46 -04:00
kyle
5236f3c773 Added a comment 2020-08-10 19:48:03 +00:00
Joey Hess
c565267118
fix order 2020-08-10 15:38:31 -04:00
Joey Hess
70d2ba03ca
Merge branch 'master' of ssh://git-annex.branchable.com 2020-08-10 15:37:54 -04:00
Joey Hess
d53b88d4e4
comment 2020-08-10 15:37:25 -04:00
Joey Hess
a354263a19
document preferred content for import/export 2020-08-10 15:35:26 -04:00
Joey Hess
9358ff8bc1
document how to build standalone tarball 2020-08-10 15:17:04 -04:00
Joey Hess
120f4f33c0
comment 2020-08-10 15:06:40 -04:00
kyle
59a8698a20 Added a comment 2020-08-10 19:01:37 +00:00
Joey Hess
0e8ec45981
add missing command name 2020-08-10 15:00:58 -04:00
kyle
8beb30e84b Added a comment 2020-08-10 18:56:03 +00:00
Joey Hess
4b05293737
comment 2020-08-10 14:42:38 -04:00
arnaud@c1d1cc612a3921dc06a417301be08a3e125478c4
dd670639ac Added a comment 2020-08-10 18:42:15 +00:00
Joey Hess
8a94f2ccd5
response 2020-08-10 14:35:20 -04:00
Joey Hess
895e341e3f
comment 2020-08-10 14:14:15 -04:00
Joey Hess
ff7d8b45ac
tag moreinfo 2020-08-10 14:12:07 -04:00
Joey Hess
23dc611a0d
Merge branch 'master' of ssh://git-annex.branchable.com 2020-08-10 14:09:24 -04:00
Joey Hess
bfdbbd0601
comment 2020-08-10 14:08:09 -04:00
Joey Hess
cd49565b71
comment 2020-08-10 13:52:18 -04:00
arnaud@c1d1cc612a3921dc06a417301be08a3e125478c4
b2d3789a83 Added a comment 2020-08-10 17:25:11 +00:00
Joey Hess
35351bf8f3
comment 2020-08-10 13:24:31 -04:00
Joey Hess
bcbdada8bf
fixed 2020-08-10 13:12:55 -04:00
Joey Hess
f0f3f4db90
comment 2020-08-10 12:57:05 -04:00
Joey Hess
02ba6f94a2
comment 2020-08-10 12:51:17 -04:00
Joey Hess
2cbebab554
improve docs and close bug 2020-08-10 12:37:25 -04:00
arnaud@c1d1cc612a3921dc06a417301be08a3e125478c4
e0df81c6c0 2020-08-10 14:46:20 +00:00
hdclark@be373988ada6dc692f87a8eefdd600432e54f7d4
2c369fad26 Added a comment: This occurs on 9P filesystem too 2020-08-07 20:41:10 +00:00
cardoso-neto
53ed61ff58 Added a comment: omg 2020-08-07 02:41:12 +00:00
cardoso-neto
04e34a039e Added a comment: Understood. 2020-08-07 02:24:47 +00:00
Joey Hess
0948ef81f6
Merge branch 'master' of ssh://git-annex.branchable.com 2020-08-06 20:14:58 -04:00
Joey Hess
506ffea5e6
stop symlink check once the top of the working tree is reached
Avoid complaining that a file with "is beyond a symbolic link" when the
filepath is absolute and the symlink in question is not actually inside the
git repository.

This assumes that inodes remain stable while the command is running.
I think they always will, the filesystems where they are unstable change
them across mounts. (If inodes were not stable, it would just complain about
symlinks in the path that are not inside the working tree.)

(On windows, I don't want to assume anything about inodes, they could be
random numbers for all I know. But if they were, this would still be ok, as
long as windows doesn't have symlinks that are detected by isSymbolicLink.
Which seems a fair bet.)
2020-08-06 20:14:30 -04:00
kyle
683f527b3b Added a comment 2020-08-06 20:58:21 +00:00
Joey Hess
a358eb1faa
comment 2020-08-06 14:38:06 -04:00
Joey Hess
4288f7576a
comment 2020-08-06 13:59:22 -04:00
Joey Hess
62214244d3
Merge branch 'master' of ssh://git-annex.branchable.com 2020-08-06 13:52:19 -04:00
Joey Hess
5d380c6c5c
when workTreeItems finds a problem with a parameter, don't go on to process it
Part of workTreeItems is trying detect a case
where git porcelain refuses to process a file, and where
git ls-files silently outputs nothing. But, it's hard to perfectly
replicate git's behavior, and besides, git's behavior could change.
So it could be that we warn, but then git ls-files does not skip over
it, and so git-annex also processes it after warning about it.

So, if we think we have a problem with a parameter, display the warning,
and skip processing it at all.

Implementing this was complicated by needing to handle the case where
all command-line parameters get filtered out this way. Which is
different than the case where there are none, because we don't want to
operate on all files in this new case..
2020-08-06 13:47:45 -04:00
Joey Hess
8312cac018
comment and moreinfo 2020-08-06 11:30:44 -04:00
Joey Hess
e2a662892e
forgot to close this earlier 2020-08-06 11:22:42 -04:00
cardoso-neto
ec0fdbb95d Added a comment: Fixing URLs. 2020-08-06 03:15:00 +00:00
cardoso-neto
ffe3a26d83 Added a comment: Correction. 2020-08-06 03:09:16 +00:00
cardoso-neto
860b1f9f17 Create bug report thread on ungraceful exit after cwd being moved/baleeted 2020-08-06 02:55:32 +00:00
cardoso-neto
38d442889c Added a comment: Improperly documented code. 2020-08-06 02:52:51 +00:00
Joey Hess
9948b8b3de
update 2020-08-05 17:47:55 -04:00
Joey Hess
ce93cc43c4
update 2020-08-05 11:49:21 -04:00
Joey Hess
283d2f85d1
importfeed: Fix reversion that caused some '.' in filenames to be replaced with '_'
sanitizeFilePath was changed to sanitize leading '.', but ImportFeed was
running it on parts of the template. So eg the leading '.' in the extension
got sanitized.

Note the added case for sanitizeLeadingFilePathCharacter ('/':_)
-- this was added because, if the template is title/episode and the title
is not set, it would expand to "/episode". So this is another potential
security fix.
2020-08-05 11:35:00 -04:00
madalu
d8517d6cfc Reporting importfeed filename bug 2020-08-04 17:19:06 +00:00
Lukey
7077a7c2e7 Added a comment 2020-08-04 14:10:33 +00:00
Joey Hess
88e5ebcda7
runshell LD_HWCAP_MASK=0 optimisation 2020-08-03 14:34:15 -04:00
git-annex.branchable.com@79d6855760f61f7fbe0a401b45d8c791ef49b500
465842f3f6 Added a comment 2020-08-02 23:41:33 +00:00
yarikoptic
5a5e13e972 Added a comment 2020-08-02 01:31:53 +00:00
yarikoptic
7bd1e392dc Added a comment 2020-07-31 21:48:21 +00:00
yarikoptic
592db0629e Added a comment 2020-07-31 21:37:48 +00:00
kyle
960180dece Added a comment 2020-07-31 21:30:34 +00:00
yarikoptic
2b9d8b4e08 Added a comment 2020-07-31 21:23:57 +00:00
kyle
d844d0a1b7 Added a comment 2020-07-31 21:20:10 +00:00
Joey Hess
f5724d78d4
comment 2020-07-31 16:47:23 -04:00
Joey Hess
5a5873e052
fix bug caught by test suite 2020-07-31 16:11:50 -04:00
Joey Hess
13db029ac0
comment 2020-07-31 16:11:10 -04:00
Joey Hess
8b4e5e6f68
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-31 14:58:02 -04:00
Joey Hess
c4ec52b9ae
Slightly sped up the linux standalone bundle
Reduce the number of directories listed in libdirs, which makes the linker
check a lot less dead ends looking for directories.

Eliminated some directories that didn't really contain shared libraries,
or only contained the linker.

That left only 2, one in lib and one in usr/lib, so consolidate those two.

Doing it this way, rather than just consolidating all libs that might exist
into a single directory means that, if there are optimised versions of some
libs, eg in lib/subarch/foo.so, and lib/subarch2/foo.so, they don't get
moved around in a way that would make the linker pick the wrong one.
2020-07-31 14:42:03 -04:00
Joey Hess
676257dfa8
comment 2020-07-31 13:29:48 -04:00
kyle
7bae35d840 prop_isomorphic_key_encode test failure 2020-07-30 17:51:20 +00:00
Ilya_Shlyakhter
85e57d8260 Added a comment: streaming data and external backends 2020-07-30 15:58:24 +00:00
Ilya_Shlyakhter
6a91ddddbc Added a comment: thanks 2020-07-30 15:51:16 +00:00
Ilya_Shlyakhter
23d15dc985 Added a comment: key length 2020-07-30 15:13:53 +00:00
Joey Hess
8200b52e12
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-29 17:28:34 -04:00
Joey Hess
877d9c4283
devblog 2020-07-29 17:27:51 -04:00
Joey Hess
049807dbba
external backends implemented 2020-07-29 17:24:34 -04:00
Joey Hess
ea63d1dfe3
E variant of external backend keys 2020-07-29 17:12:22 -04:00
Joey Hess
b6fa4cb42f
external backends genKey and verifyKeyContent implemented
Only key translation for HasExt remains..
2020-07-29 16:36:32 -04:00
Joey Hess
f75be32166
external backends wip
It's able to start them up, the only thing not implemented is generating
and verifying keys. And, the key translation for HasExt.
2020-07-29 15:23:18 -04:00
Joey Hess
b5d6a36db0
note external backend names cannot end with E
also markdown improvements
2020-07-29 14:01:49 -04:00
Ilya_Shlyakhter
8bc12d3cc4 Added a comment: version correspondence of standalone builds and official releases 2020-07-29 15:36:39 +00:00
yarikoptic
6b26802047 Added a comment 2020-07-28 15:26:43 +00:00
yarikoptic
61e96d7be4 Added a comment 2020-07-28 15:18:44 +00:00
leej
2105c6e9a7 Added a comment 2020-07-28 14:58:00 +00:00
nicholsn
60f3626338 Added a comment: Thank you 2020-07-28 03:57:34 +00:00
yarikoptic
a846655d69 Added a comment 2020-07-27 21:40:55 +00:00
Joey Hess
33e5ef4164
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-27 16:57:40 -04:00
Joey Hess
3fafcc47bb
comment 2020-07-27 16:53:21 -04:00
kyle
8a594395f3 'beyond symlink' error for upstream link 2020-07-27 19:37:13 +00:00
Joey Hess
7ea8411cfb
comment 2020-07-27 11:40:30 -04:00
Joey Hess
9d9f1f85d6
comment 2020-07-27 11:37:12 -04:00
Joey Hess
36d1621c35
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-27 11:34:03 -04:00
Joey Hess
2e702960ab
followup and close 2020-07-27 11:33:47 -04:00
Joey Hess
3953c7a0ce
add DEBUG 2020-07-27 11:31:00 -04:00
ghen1
ad391da6b8 2020-07-27 15:24:21 +00:00
ghen1
1c495a856d Added a comment 2020-07-27 15:18:55 +00:00
leej
e8135f27ef 2020-07-25 00:15:34 +00:00
Ilya_Shlyakhter
c694eb2a1c Added a comment: updating the standalone distribution 2020-07-24 19:28:22 +00:00
Joey Hess
00c5f04f20
Deal with unusual IFS settings in the shell scripts for linux standalone and OSX app.
Thanks, Yaroslav Halchenko
2020-07-24 14:46:50 -04:00
Joey Hess
3627f03996
comment 2020-07-24 14:36:50 -04:00
Joey Hess
79187a6eaf
Revert "Unset IFS in shell scripts in the linux standalone build and OSX app."
This reverts commit 24125e8dc4.

yoh has a better patch I see
2020-07-24 14:33:13 -04:00
Joey Hess
24125e8dc4
Unset IFS in shell scripts in the linux standalone build and OSX app. 2020-07-24 14:31:11 -04:00
Joey Hess
2e241f92c7
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-24 14:15:44 -04:00
Joey Hess
bdda55ab6f
devblog 2020-07-24 14:15:29 -04:00
Joey Hess
32e1d7bc31
add 2020-07-24 14:11:08 -04:00
nix.zahlen@1211ac6c964ba2d68b70655f747bef1383032e77
df77d63e76 Added a comment: It is really a pitty that the Windows port / version is unmaintained 2020-07-24 17:48:10 +00:00
Joey Hess
c5ea2e9d12
better benchmark for move/copy speedup 2020-07-24 13:34:12 -04:00
Joey Hess
18f1fb5841
drop performance improvements
Sped up seeking files to drop by 2x, and also some performance
improvements to checking numcopies.

Interestingly, the seek speedup is not due to precaching, but I think is
due to calling getParsed earlier.

Annex.Drop had to be changed to check inAnnex there, since it was removed
from Command.Drop. All other users of Command.Drop already checked inAnnex
themselves.

This commit was sponsored by Ryan Newton on Patreon.
2020-07-24 13:27:46 -04:00
Joey Hess
d732ef1a89
move, copy: Sped up seeking for annexed files to operate on by a factor of nearly 2x. 2020-07-24 12:56:02 -04:00
erewhon
694c2dc16c Added a comment 2020-07-24 16:05:08 +00:00
yarikoptic
d7e04e5e3a Added a comment 2020-07-24 15:22:40 +00:00
yarikoptic
4ff59a85d5 report on intolerance of IFS 2020-07-24 01:42:59 +00:00
flpgdt@f64318f00d9e1c9535e11f5d27c80c1d799cce00
d604cd621b 2020-07-23 13:12:38 +00:00
karel-de-macil
39337c604b 2020-07-23 10:30:35 +00:00
karel-de-macil
8325db46a6 2020-07-23 10:28:43 +00:00
karel-de-macil
205d6ea3e7 Added a comment 2020-07-23 10:17:09 +00:00
karel-de-macil
c6454b9b22 2020-07-23 08:32:56 +00:00
Joey Hess
4685612f43
small git-annex get speedup
Remove an redundant inAnnex check. The checkContentPresent handles that,
and after the last commit also does in batch mode.
2020-07-22 14:29:30 -04:00
Joey Hess
1be92381ec
unify batch mode with non-batch by using AnnexedFileSeeker 2020-07-22 14:23:28 -04:00
kyle
155b56f015 Added a comment 2020-07-22 16:12:25 +00:00
mreiden
6dbe68bac5 Added a comment: Autobuild permissions 2020-07-22 16:07:22 +00:00
kyle
0538dc425c Added a comment 2020-07-22 16:01:05 +00:00
Joey Hess
d9ae6ab0b4
comment 2020-07-22 11:12:38 -04:00
Joey Hess
8da851d585
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-22 11:06:13 -04:00
Joey Hess
aa492bc659
Fix a hang when using git-annex with an old openssh 7.2p2
This does mean a 2 second delay after transfers when using that ssh, but
it's an old and apparently quite weirdly broken version of ssh.
2020-07-22 11:04:33 -04:00
Barafu
6dbef88eee 2020-07-21 23:25:06 +00:00
Joey Hess
afaae84f49
comment 2020-07-21 16:50:26 -04:00
Joey Hess
cb74cefde7
Fix a hang when using git-annex with an old openssh 7.2p2
Which had some weird inheriting of ssh FDs by sshd.

Bug was introduced in git-annex version 7.20200202.7.
2020-07-21 16:14:25 -04:00
Joey Hess
b75aa68bfa
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-21 15:31:04 -04:00
Joey Hess
ac56a5c2a0
Fix a lock file descriptor leak that could occur when running commands like git-annex add with -J
Bug was introduced as part of a different FD leak fix in version 6.20160318.
2020-07-21 15:30:47 -04:00
Joey Hess
fd8339005a
update 2020-07-21 14:44:07 -04:00
Barafu
314aef3471 2020-07-21 18:43:40 +00:00
Barafu
75d59a47d7 2020-07-21 18:42:32 +00:00
Ilya_Shlyakhter
59917f8a6d Added a comment: external backend protocol 2020-07-21 17:43:27 +00:00
Joey Hess
473e9767f4
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-21 13:01:11 -04:00
Ilya_Shlyakhter
b1e84e61e1 posted build questions 2020-07-21 15:06:23 +00:00
Joey Hess
77f7157ddb
analysis 2020-07-21 10:30:46 -04:00
Joey Hess
4de4c36d2b
dup 2020-07-21 10:07:23 -04:00
flpgdt@f64318f00d9e1c9535e11f5d27c80c1d799cce00
c129221686 2020-07-21 12:49:12 +00:00
Joey Hess
2ce34f1870
add news item for git-annex 8.20200720.1 2020-07-20 19:58:35 -04:00
Joey Hess
1ccb6699a1
guidance on size and mtime fields 2020-07-20 19:56:47 -04:00
Joey Hess
abd56fb019
Fix a bug in find --batch in the previous version. 2020-07-20 19:50:53 -04:00
Joey Hess
8499c6d65a
cleanup 2020-07-20 14:42:02 -04:00
Joey Hess
5c5e2ed8cf
add news item for git-annex 8.20200720 2020-07-20 14:41:43 -04:00
Joey Hess
2630bb766a
fix link 2020-07-20 14:25:24 -04:00
Joey Hess
8b0fbc1391
formatting 2020-07-20 14:23:01 -04:00
Joey Hess
adf4f25a1c
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-20 14:19:24 -04:00
Joey Hess
f71310fed0
comment 2020-07-20 14:19:13 -04:00
Joey Hess
d1300eca2e
draft external backend protocol 2020-07-20 14:05:49 -04:00
gueux
225fd08b6d Added a comment 2020-07-20 06:45:25 +00:00
Joey Hess
4be5567372
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-19 21:31:37 -04:00
Joey Hess
889603336a
fix reversion in skipping deleted files
And add a test case for that.

This certianly loses some of the 2x performance improvement in file
seeking that seekFilteredKeys led to, because now it has to stat the
worktree files again. Without benchmarking, I expect there will still be
a sizable improvement, and also the git-annex branch precaching that
seekFilteredKeys can do will still be a win of its approach.

Also worth noting that lookupKey, when the file DNE, check if it's in an
adjusted branch with hidden files, and if so, finds the key for the
file anyway. That was intended to make git-annex sync --content be able
to process those files, but a side effect was that, when a file was
deleted but the deletion not yet staged, git-annex commands used to
still list it. That was actually a bug. This commit fixes that bug too.
(git-annex sync --content on such a branch does not use seekFilteredKeys
so was not affected by the reversion or by this behavior change)

This commit was sponsored by Jake Vosloo on Patreon.
2020-07-19 21:25:01 -04:00
Joey Hess
b5590e916e
analysis 2020-07-19 20:14:49 -04:00
Joey Hess
1489fbbdde
bug 2020-07-19 18:26:57 -04:00
mzimann
7d09ca4363 Added a comment: Use curl instead of wget 2020-07-18 22:44:20 +00:00
yarikoptic
6a05388877 Added a comment 2020-07-18 05:09:54 +00:00
yarikoptic
7ee0bcbee7 Added a comment 2020-07-18 05:09:32 +00:00
yarikoptic
4ab711e153 Added a comment 2020-07-18 04:50:12 +00:00
yarikoptic
a6b0147b7f Added a comment 2020-07-18 04:49:49 +00:00
yarikoptic
d7b4df85e4 Added a comment 2020-07-18 04:34:26 +00:00
yarikoptic
5215fe92b9 Added a comment 2020-07-18 04:34:05 +00:00
Ilya_Shlyakhter
526a549766 Added a comment 2020-07-18 03:58:18 +00:00
yarikoptic
360de9446e Added a comment 2020-07-18 03:57:20 +00:00
yarikoptic
c46b9ac4ae initial 2nd wave of whining about startup time and to consider prelink or alike 2020-07-18 03:54:34 +00:00
erewhon
aa554e1adb 2020-07-17 16:38:22 +00:00
yarikoptic
4f152089eb Added a comment: Windows build of file (which includes libmagic) 2020-07-16 22:01:17 +00:00
kyle
f818da2f85 bug: find --batch regression 2020-07-16 21:53:14 +00:00
Joey Hess
a3a8779501
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-16 15:08:51 -04:00
Ilya_Shlyakhter
77299ae6e5 Added a comment: external backends 2020-07-16 17:30:55 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
059d56659b Added a comment: GIT_TRACE=1 debug shows smudge --clean is run twice per file 2020-07-16 17:06:13 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
1836f7a318 2020-07-16 16:32:41 +00:00
Joey Hess
5ab3849da3
thought 2020-07-15 20:42:53 -04:00
Joey Hess
ebdbb87716
comment 2020-07-15 16:11:34 -04:00
Joey Hess
fdf4bdd875
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-15 16:08:49 -04:00
Joey Hess
034f958b09
comment 2020-07-15 14:02:31 -04:00
kyle
e8197c9e74 fixed elsewhere 2020-07-15 16:35:46 +00:00
Joey Hess
aa44126bc0
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-15 11:27:38 -04:00
Joey Hess
a7156b875c
fix fsck reversion
75aab72d23 made fsck skip files whose
content is not present, but it should complain if there are not enough
copies.
2020-07-15 11:21:43 -04:00
Joey Hess
32c847d1a1
analysis 2020-07-15 11:13:02 -04:00
Joey Hess
5d59bb9554
add 2020-07-15 10:58:45 -04:00
Joey Hess
360dc386e7
comment 2020-07-15 10:08:37 -04:00
Joey Hess
1bc015bff4
tag datalad at yoh's req 2020-07-15 09:51:57 -04:00
nolan.nichols@fe8d6ffa163484d0632235838db69df04538caf1
af6088bcba 2020-07-15 03:32:24 +00:00
Joey Hess
6d0ed43786
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-14 21:44:51 -04:00
Joey Hess
e66ba410fc
todo 2020-07-14 21:44:31 -04:00
kyle
e55263046f tag issue 2020-07-15 00:58:03 +00:00
kyle
8c65cab4c6 recent test failures 2020-07-15 00:52:39 +00:00
Joey Hess
9a3b0500e8
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-14 20:04:47 -04:00
flpgdt@f64318f00d9e1c9535e11f5d27c80c1d799cce00
2d5cb06ae2 removed 2020-07-14 22:47:22 +00:00
flpgdt@f64318f00d9e1c9535e11f5d27c80c1d799cce00
1ed3b6567d Added a comment 2020-07-14 22:40:56 +00:00
kyle
13bff1a8e1 Added a comment 2020-07-14 20:13:22 +00:00
karel.de.macil@58e46458e7db066384a55b59a366d2025c4b4523
425717f571 2020-07-14 19:43:49 +00:00
kyle
ed99f652fa Added a comment 2020-07-14 19:18:10 +00:00
Joey Hess
f9b4a9f650
update 2020-07-14 14:47:22 -04:00
Joey Hess
7b2d236556
importfeed: stream metadata for 5% speedup
On top of the 10% speedup from streaming url logs.
2020-07-14 14:35:26 -04:00
Joey Hess
535cdc8d48
importfeed: Made checking known urls step around 10% faster.
This was a bit disappointing, I was hoping for a 2x speedup. But, I think
the metadata lookup is wasting a lot of time and also needs to be made to
stream.

The changes to catObjectStreamLsTree were benchmarked to not also speed
up --all around 3% more. Seems I managed to make it polymorphic after all.
2020-07-14 12:47:51 -04:00
Joey Hess
e223ddb774
comments 2020-07-13 17:52:03 -04:00
Joey Hess
c893743819
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-13 17:13:02 -04:00
Joey Hess
75aab72d23
mostly done with location log precaching
Some nice wins.
2020-07-13 17:04:02 -04:00
kyle
592548a843 Added a comment 2020-07-13 19:27:18 +00:00
kyle
b94481a3b9 Added a comment 2020-07-13 19:04:45 +00:00
Joey Hess
df58609804
convert sync to use seekFilteredKeys
This only speeds up sync --content from 34.75 to 33.17 seconds;
location log precaching will probably be a bigger win.
2020-07-13 15:02:52 -04:00
Joey Hess
f34edf0011
close 2020-07-13 13:27:43 -04:00
Joey Hess
4dd5cfa463
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-13 13:26:28 -04:00
Joey Hess
8219dbcb95
comment 2020-07-13 13:25:10 -04:00
Joey Hess
ba345e90b5
test metadata 2020-07-13 12:53:09 -04:00
kyle
800b36ccff Added a comment 2020-07-13 16:50:37 +00:00
kyle
ed7afd4f6d Added a comment 2020-07-13 16:46:54 +00:00
Joey Hess
918b1faa3d
avoid hanging on exception 2020-07-13 12:36:15 -04:00
Joey Hess
bff5694f55
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-13 12:18:05 -04:00
Joey Hess
1b2f29b207
comment 2020-07-13 12:16:48 -04:00
Joey Hess
c70ae68d7e
update 2020-07-13 11:49:24 -04:00
Joey Hess
415d394222
thought 2020-07-13 11:04:57 -04:00
kyle
575317a444 metadata --remove hang on 88a7fb5cb 2020-07-11 01:12:31 +00:00
kyle
780f8675f6 git-annex-init hang on older systems 2020-07-10 20:57:47 +00:00
Joey Hess
a7fcda861f
comment 2020-07-10 16:09:13 -04:00
Joey Hess
2b62e7dad4
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-10 16:04:54 -04:00
Joey Hess
5b3bed33c5
devblog 2020-07-10 16:00:39 -04:00
barak
7397bd75ea 2020-07-10 19:52:11 +00:00
Joey Hess
a32b6f9812
update 2020-07-10 15:49:03 -04:00
Joey Hess
412b09e17e
update 2020-07-10 15:23:12 -04:00
Joey Hess
2468eefc6d
2x speedup for annex file seeking on the horizon 2020-07-10 14:02:48 -04:00
Joey Hess
1df9e72a78
update 2020-07-10 13:31:47 -04:00
Joey Hess
6b9d1c1317
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-10 13:16:11 -04:00
barak
59c90643cd typo 2020-07-10 14:26:22 +00:00
Joey Hess
6e9fcf468d
streamkeys branch 2020-07-09 14:48:03 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
b2581d4dd1 Added a comment: I've moved my auto-sync-daemon script 2020-07-09 14:24:48 +00:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
bbc3800369 Added a comment: Update on my auto-commit / auto-sync scripts 2020-07-09 14:23:15 +00:00
Ilya_Shlyakhter
96aad5458b Added a comment: re: git-annex-cat 2020-07-09 01:06:37 +00:00
Ilya_Shlyakhter
75b96059af Added a comment: git-annex-cat 2020-07-09 00:21:02 +00:00
Joey Hess
9f6bd6cc05
add inRepoDetails
planned to use for an optimisation

most things using stagedDetails were not expecting to get dup files in a
conflicted merge and deal with them, so converted them to use
inRepoDetails.
2020-07-08 15:36:35 -04:00
Joey Hess
c1eaf5b930
note 2020-07-08 14:21:37 -04:00
Joey Hess
d08c178f97
avoid catObjectStream skipping over unavailable shas
Not needed as it's used for --all, but will be needed later.
2020-07-08 13:57:17 -04:00
Joey Hess
de3d7d044d
make catObjectStream support newline and carriage return in filenames
Turns out the %(rest) trick was not needed. Instead, just maintain a
list of files we've asked for, and each cat-file response is for the
next file in the list.

This actually benchmarks 25% faster than before! Very surprising, but it
must be due to needing to shove less data through the pipe, and parse
less.
2020-07-08 13:49:03 -04:00
Joey Hess
2cf6717aec
thoughts 2020-07-08 10:51:24 -04:00
Joey Hess
5849bd6340
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-07 16:50:26 -04:00
Joey Hess
afd9b2f667
idea 2020-07-07 16:49:44 -04:00
yarikoptic
c9d0bf0e6a reassign to datalad - generic enhancement 2020-07-07 19:05:59 +00:00
Joey Hess
ba0adefe4c
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-07 14:19:46 -04:00
Joey Hess
d010ab04be
sped up the --all option by 2x to 16x by using git cat-file --buffer
This assumes that no location log files will have a newline or carriage
return in their name. catObjectStream skips any such files due to
cat-file not supporting them.

Keys have been prevented from containing newlines since 2011,
commit 480495beb4. If some old repo
had a key with a newline in it, --all will just skip processing that key.
Other things, like .git/annex/unused files certianly assume no newlines in
keys too, and AFAICR, such keys never actually worked.

Carriage return is escaped by preSanitizeKeyName since 2013. WORM keys
generated before that point could perhaps contain a CR. (URL probably not,
http probably doesn't support an URL with a raw CR in it.) So, added
a warning in fsck about such keys. Although, fsck --all will naturally
skip them, so won't be able to warn about them. Not entirely
satisfactory, but I'll bet there are not really any such keys in
existence.

Thanks to Lukey for finding this optimisation.
2020-07-07 13:54:04 -04:00
flpgdt@f64318f00d9e1c9535e11f5d27c80c1d799cce00
c4994c608e Added a comment 2020-07-07 16:54:46 +00:00
kyle
a5142499ce rsync hang 2020-07-07 15:26:38 +00:00
timothy.sanders@a7ce3a8bae11a60e0c4cda9cb4aef24ec459bbab
3b6754e2a5 2020-07-07 10:26:00 +00:00
timothy.sanders@a7ce3a8bae11a60e0c4cda9cb4aef24ec459bbab
8a9323f5b5 2020-07-07 10:24:29 +00:00
Lukey
56f5d99ceb Added a comment 2020-07-06 21:20:58 +00:00
Joey Hess
9468675ba9
note 2020-07-06 15:12:26 -04:00
Joey Hess
d66fc1a464
Revert "async exception safety for coprocesses"
This reverts commit 7013798df5.
2020-07-06 15:11:28 -04:00
Joey Hess
6b8c961e1f
some analysis but stuck 2020-07-06 14:46:05 -04:00
Joey Hess
dfa1c21b8a
comment
and update changelog with benchmark results
2020-07-06 13:39:42 -04:00
Joey Hess
0518b62d2b
update 2020-07-06 12:58:29 -04:00
Joey Hess
9a2fbc2ea8
comment 2020-07-06 11:58:14 -04:00
Joey Hess
27bbeea00e
close 2020-07-06 10:49:06 -04:00
Joey Hess
e2a4c49004
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-06 10:46:52 -04:00
andrew
48a6978d55 Added a comment: transfer repos 2020-07-05 17:25:49 +00:00
Joey Hess
4ac504cd2e
update 2020-07-05 11:12:10 -04:00
flpgdt@f64318f00d9e1c9535e11f5d27c80c1d799cce00
bbd5d1503d 2020-07-04 23:47:54 +00:00
jenkin.schibel@286264d9ceb79998aecff0d5d1a4ffe34f8b8421
151efb9c3c Added a comment: problem fixed itself 2020-07-04 03:28:26 +00:00
jenkin.schibel@286264d9ceb79998aecff0d5d1a4ffe34f8b8421
e40ba93924 Added a comment: problem fixed itself 2020-07-04 03:27:59 +00:00
Ilya_Shlyakhter
f6af30a7af Added a comment 2020-07-03 19:55:36 +00:00
Joey Hess
52e72f878e
expand 2020-07-03 14:42:04 -04:00
Joey Hess
c016527cb5
link 2020-07-03 14:40:13 -04:00
Joey Hess
d89b52086e
close 2020-07-03 14:31:12 -04:00
Joey Hess
b1fb4f9f58
clarify 2020-07-03 14:31:08 -04:00
Joey Hess
28fee95d4e
extend proposed interface with IMPORTKEY 2020-07-03 14:23:04 -04:00
Joey Hess
85506a7015
import: Added --no-content option, which avoids downloading files from a special remote
Only supported by some special remotes: directory
I need to check the rest and they're currently missing methods until I do.

git-annex sync --no-content does not yet use this to do imports
2020-07-03 13:41:57 -04:00
Joey Hess
a8099b9896
thought 2020-07-03 12:02:07 -04:00
Joey Hess
8ca0cdb0ac
reflow to fix man page conversion 2020-07-03 11:54:21 -04:00
Joey Hess
6953cc830a
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-03 10:34:18 -04:00
petersjt014@c20995a2e26a13566cd49aef30a99a7dff732a4e
668f3278b9 2020-07-03 07:36:41 +00:00
petersjt014@c20995a2e26a13566cd49aef30a99a7dff732a4e
ba209702c1 Added a comment: tor remote 2020-07-03 07:33:54 +00:00
Joey Hess
89108d6f5a
thought 2020-07-02 21:56:00 -04:00
Joey Hess
e463ef1b91
comment 2020-07-02 20:13:19 -04:00
Joey Hess
a3e125c1fe
move to re-notify 2020-07-02 20:05:54 -04:00
Joey Hess
8fc9788363
fix commment 2020-07-02 20:05:36 -04:00
jenkin.schibel@286264d9ceb79998aecff0d5d1a4ffe34f8b8421
51aa291b20 2020-07-02 21:23:18 +00:00
yarikoptic
edef3c25b3 Added a comment: map2url? 2020-07-02 20:41:15 +00:00
Ilya_Shlyakhter
df65c4796d Added a comment 2020-07-02 20:22:26 +00:00
yarikoptic
b7a78cbb26 Added a comment 2020-07-02 20:14:20 +00:00
kyle
a379ea833e Added a comment 2020-07-02 20:07:10 +00:00
Joey Hess
3353ff236a
comment 2020-07-02 15:30:16 -04:00
Joey Hess
629026bdbc
followup 2020-07-02 15:06:00 -04:00
Joey Hess
d8ad2204c7
comment 2020-07-02 14:43:52 -04:00
Joey Hess
f8ed8a916c
design 2020-07-02 14:35:59 -04:00
Joey Hess
a88b671bd9
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-02 14:17:31 -04:00
Joey Hess
caaeba0be9
thoughts 2020-07-02 14:15:47 -04:00
yarikoptic
1d51db3b02 Added a comment: more ideas for async implementation 2020-07-02 17:44:44 +00:00
Joey Hess
f912f8e5fd
refix bug in a better way
Always run Git.Config.store, so when the git config gets reloaded,
the override gets re-added to it, and changeGitRepo then calls extractGitConfig
on it and sees the annex.* settings from the override.

Remove any prior occurance of -c v and add it to the end. This way,
-c foo=1 -c foo=2 -c foo=1 will pass -c foo=1 to git, rather than -c foo=2

Note that, if git had some multiline config that got built up by
multiple -c's, this would not work still. But it never worked because
before the bug got fixed in the first place, the -c value was repeated
many times, so the multivalue thing would have been wrong. I don't think
-c can be used with multiline configs anyway, though git-config does
talk about them?
2020-07-02 13:32:33 -04:00
Joey Hess
ec0f8a6e74
Fix reversion that broke passing git configs with -c
Reverting commit c8fec6ab0
2020-07-02 12:42:13 -04:00
Joey Hess
0b5515899b
comment 2020-07-02 12:18:02 -04:00
Joey Hess
fe1f4632a4
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-02 10:00:11 -04:00
B
d409f92318 Added a comment: Workaround 2020-07-02 12:51:41 +00:00
Joey Hess
00c9eb4c78
comment 2020-07-01 20:12:10 -04:00
Ilya_Shlyakhter
d03902f7ff Added a comment: annex.thin for importing from directory special remote 2020-07-01 22:23:58 +00:00
http://templeofcrom.duckdns.org/
98b3d31b95 Added a comment 2020-07-01 21:54:49 +00:00
Lukey
5a64acf790 Added a comment 2020-07-01 20:37:13 +00:00
Joey Hess
117bd04693
more details 2020-07-01 16:20:37 -04:00
Ilya_Shlyakhter
afc705f7c8 Added a comment: adding files also fails 2020-07-01 19:51:34 +00:00
Ilya_Shlyakhter
2db76f8144 added bug report about git-annex-init on a repo in VirtualBox shared folder 2020-07-01 19:39:14 +00:00
Joey Hess
640dbaaaf8
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-01 15:15:47 -04:00
Joey Hess
11c2886578
overlapping todos 2020-07-01 15:06:36 -04:00
Ilya_Shlyakhter
bc9c7c3b2c question about building the standalone distribution 2020-07-01 18:53:07 +00:00
Ilya_Shlyakhter
d1232e385b Added a comment 2020-07-01 17:33:49 +00:00
Ilya_Shlyakhter
6eb318cd53 Added a comment: git pack files 2020-07-01 17:32:45 +00:00
Joey Hess
424b1912d6
followup and add link 2020-07-01 12:28:44 -04:00
Joey Hess
a496ab602d
todo 2020-07-01 12:07:11 -04:00
Joey Hess
ead8afe2f3
comment 2020-07-01 11:38:44 -04:00
Joey Hess
07dff32bd4
Merge branch 'master' of ssh://git-annex.branchable.com 2020-07-01 11:23:39 -04:00
http://templeofcrom.duckdns.org/
282f63d4ed Added a comment 2020-07-01 15:03:08 +00:00
Lukey
ffb03cc959 Added a comment 2020-07-01 14:32:12 +00:00
https://bmwiedemann.zq1.de/
e3d091f12c Added a comment 2020-07-01 02:47:05 +00:00
Joey Hess
98a8a6da81
todo 2020-06-30 18:41:47 -04:00
kyle
9bd56b5494 Added a comment 2020-06-30 21:24:56 +00:00
Joey Hess
33c26988f6
comment 2020-06-30 17:21:17 -04:00
Joey Hess
4af5fc3505
fixed oops 2020-06-30 17:16:29 -04:00
Joey Hess
3935ce8be5
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-30 17:15:31 -04:00
Joey Hess
8f508d4406
comments 2020-06-30 16:41:31 -04:00
Joey Hess
5891e10409
bug report 2020-06-30 16:40:08 -04:00
https://bmwiedemann.zq1.de/
814698bd53 Added a comment 2020-06-30 19:47:35 +00:00
kyle
80bb42a3ca stack build failure 2020-06-30 19:08:32 +00:00
Joey Hess
73c9331b15
remove obsolete links 2020-06-30 13:41:18 -04:00
Joey Hess
1d335520df
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-30 12:27:19 -04:00
kyle
59e64842a7 Added a comment 2020-06-30 16:26:17 +00:00
Joey Hess
137450c9fe
thoughts 2020-06-30 12:24:08 -04:00
kyle
e4e28452a0 annex-ssh-options regression 2020-06-30 15:48:03 +00:00
Lukey
e6ca4cd0df 2020-06-30 15:46:57 +00:00
https://bmwiedemann.zq1.de/
68549767e9 Added a comment 2020-06-30 15:26:10 +00:00
Joey Hess
4a3c5ca071
comment 2020-06-30 11:17:38 -04:00
Joey Hess
8d25eee321
move Void page to install 2020-06-30 11:11:39 -04:00
Joey Hess
84fd6ef157
comment 2020-06-30 10:53:52 -04:00
Joey Hess
138e6a7f9c
remove comment as they also asked the same thing in a forum post, and were anwsered there 2020-06-30 10:43:59 -04:00
Joey Hess
e9c1f69060
remove support comment as this is not the place and also they asked the same question over email and were answered there 2020-06-30 10:42:57 -04:00
Joey Hess
7a4253a155
followup and close as this is intentional 2020-06-30 10:41:26 -04:00
Joey Hess
e2cddc28a5
comment 2020-06-30 10:28:50 -04:00
Joey Hess
6780648bba
comment 2020-06-30 10:20:27 -04:00
yarikoptic
692cea01e4 an idea on a (more) efficient transfer via async external remote protocol 2020-06-30 04:37:22 +00:00
http://templeofcrom.duckdns.org/
84a3d8298a 2020-06-29 20:15:21 +00:00
https://bmwiedemann.zq1.de/
95b8b4a5af 2020-06-29 14:02:17 +00:00
nix.zahlen@1211ac6c964ba2d68b70655f747bef1383032e77
6ffeab2e96 Added a comment: windows installer has not been updated 2020-06-28 20:01:35 +00:00
anarcat
a7a42c8848 Added a comment 2020-06-26 20:29:26 +00:00
Joey Hess
7fd20146e1
all easy cases done
bup can't do it after all, because removeKey deletes the git branch. And
the rest seem too hard to tackle today.
2020-06-26 14:24:48 -04:00
Joey Hess
76721b62dd
does not make sense to lockContent on web
Looked into this, and dropKey from web actually removes the url,
so git-annex won't try to get content from it.

So, if lockContent were implemented for web, and the web was left as the
only thing containing an object, another repo could at the same time
drop from web and remove its url, leaving no way to get the object.

Add to that, of course, the web is typically set untrusted, and so
implementing lockContent would not then be useful.

Similar reasoning applies to the bittorrent special remote, as well
as the fact that it does not even implement checkKey.
2020-06-26 13:58:28 -04:00
Joey Hess
b316a85ede
update 2020-06-26 13:54:23 -04:00
Joey Hess
7203353e24
comment 2020-06-26 12:18:18 -04:00
yarikoptic
ff8e9f4b5f Added a comment 2020-06-26 14:22:25 +00:00
yarikoptic
50bf73f043 initial report on an odd fail 2020-06-26 14:17:56 +00:00
strmd
434af033e0 Added a comment 2020-06-24 22:37:50 +00:00
Joey Hess
bf2aa50646
document the 2_ files 2020-06-24 14:31:46 -04:00
Joey Hess
4229713e63
importfeed: Added some additional --template variables for date and time
This commit was sponsored by Ethan Aubin.
2020-06-24 14:24:50 -04:00
Joey Hess
57edd81849
improve docs of template variables 2020-06-24 13:30:36 -04:00
Joey Hess
b38cc371ad
close per comments 2020-06-24 12:53:13 -04:00
Joey Hess
1b1863673b
close as dup 2020-06-24 12:50:19 -04:00
Joey Hess
725b1395b0
close, fixed 3 years ago 2020-06-24 12:48:46 -04:00
Joey Hess
5eeac2a9c9
close 2020-06-24 12:40:37 -04:00
Joey Hess
f744882e34
comment 2020-06-24 12:37:10 -04:00
Joey Hess
86968e366c
open bug 2020-06-23 17:07:46 -04:00
Joey Hess
a364effc02
comment 2020-06-23 16:22:34 -04:00
Joey Hess
ed69f50361
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-23 16:08:53 -04:00
Joey Hess
7757c0e900
Honor annex.largefiles when importing a tree from a special remote.
This commit was sponsored by Martin D on Patreon.
2020-06-23 16:07:18 -04:00
Joey Hess
d045e39058
thoughts 2020-06-23 14:14:13 -04:00
Joey Hess
3da4caa785
thoughts 2020-06-23 13:51:10 -04:00
kyle
db6a06c55c Added a comment 2020-06-23 13:29:41 +00:00
ubermonk@47e490d382daa4f97abfdabb6d97c86f5fcb1f8f
69c321b8d7 created new thread 2020-06-22 23:12:11 +00:00
ghen1
390d5a36ac 2020-06-22 20:55:35 +00:00
ghen1
74123f26ad Added a comment 2020-06-22 20:40:11 +00:00
Joey Hess
400b03115e
close 2020-06-22 14:46:02 -04:00
Joey Hess
b97d8030f3
respond and close 2020-06-22 14:44:14 -04:00
Joey Hess
e2f739b0c8
comment and close 2020-06-22 14:38:09 -04:00
Joey Hess
b904748ee3
guess yoh meant projects/datalad here, not projects/yoh 2020-06-22 14:26:33 -04:00
Joey Hess
5098236c6b
testremote: Fix over-allocation of resources and bad caching
Including starting up a large number of external special remote processes.
(Regression introduced in version 8.20200501)
2020-06-22 14:25:49 -04:00
http://templeofcrom.duckdns.org/
abc2d3c2cb Added a comment: initremote type=web 2020-06-21 02:24:09 +00:00
ink
a6fffac9ae 2020-06-20 10:45:24 +00:00
yarikoptic
6491691801 initial report on breed of children processes by testremote 2020-06-19 20:41:21 +00:00
OE_Sunil
4637c5a37e Added a comment: Error on startup after uninstalling Git-Annex 2020-06-19 09:32:14 +00:00
Franky
b656c0853f 2020-06-19 02:16:19 +00:00
Franky
f25c69087c removed 2020-06-19 02:12:05 +00:00
Franky
0b5d1e17b0 removed 2020-06-19 02:10:29 +00:00
Franky
47bffd3357 2020-06-18 22:57:36 +00:00
Franky
549c9b1e0b 2020-06-18 22:54:03 +00:00
Franky
3385d7bbeb 2020-06-18 22:50:22 +00:00
Franky
a27798c35f 2020-06-18 22:48:59 +00:00
yarikoptic
775c1cb032 Added a comment 2020-06-18 19:17:27 +00:00
Joey Hess
22ac56fece
test suite passing 2020-06-18 13:55:32 -04:00
Joey Hess
82381211fa
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-18 12:26:30 -04:00
Franky
852dae987f Added a comment 2020-06-18 16:17:39 +00:00
Joey Hess
348821c9cf
analysis of deadlock 2020-06-18 12:10:54 -04:00
mzimann
2044487158 Added a comment: push doc-only changes 2020-06-18 15:54:52 +00:00
Joey Hess
d46490c17f
add news item for git-annex 8.20200617 2020-06-17 16:00:23 -04:00
Joey Hess
3464fa12c7
meh 2020-06-17 15:58:39 -04:00
Joey Hess
762fd5ae5d
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-17 15:35:27 -04:00
strmd
8c8e61ca1d Added a comment 2020-06-17 19:34:13 +00:00
Joey Hess
82448bdf39
fix a annex.pidlock issue
That made eg git-annex get of an unlocked file hang until the
annex.pidlocktimeout and then fail.

This fix should be fully thread safe no matter what else git-annex is
doing.

Only using runsGitAnnexChildProcess in the one place it's known to be a
problem. Could audit for all places where git-annex runs itself as a child
and add it to all of them, later.
2020-06-17 15:30:59 -04:00
Franky
bc3f9999b0 2020-06-17 19:07:00 +00:00
Franky
d72d76c06f 2020-06-17 19:01:44 +00:00
Franky
e98f9f7684 2020-06-17 19:00:36 +00:00
Franky
af5369bc92 2020-06-17 18:58:51 +00:00
Joey Hess
9583b267f5
confirmed fix 2020-06-17 12:12:41 -04:00
Ilya_Shlyakhter
4956891300 Added a comment: building the standalone distribution 2020-06-17 14:22:34 +00:00
https://dead-doomer.livejournal.com/
4794416b9c Added a comment 2020-06-17 06:42:53 +00:00
https://dead-doomer.livejournal.com/
a98b03b674 Added a comment 2020-06-17 02:41:51 +00:00
https://dead-doomer.livejournal.com/
2524a84a15 Corrected the first command to match what is actually on the file system 2020-06-17 01:17:25 +00:00
https://dead-doomer.livejournal.com/
08bc046416 Added a comment 2020-06-17 01:13:46 +00:00
Joey Hess
b072b71c27
one more bugfix to external special remote creds
The creds are passedthrough in this case, so check for such first to
avoid a crash when getRemoteConfigValue sees a type it was not
expecting.
2020-06-16 18:28:26 -04:00
Joey Hess
ad81feb053
fix implicit embedcreds regression
Fix bug that made creds not be stored in git when a special remote was
initialized with gpg encryption, but without an explicit embedcreds=yes.

(Yet nother regression introduced in version 7.20200202.7. 5th so far.)
2020-06-16 18:00:19 -04:00
Joey Hess
4773713cc9
analysis of regression and fix related less serious regression 2020-06-16 15:16:36 -04:00
Joey Hess
5b8933b914
comment 2020-06-16 15:16:35 -04:00
Joey Hess
9e0bafd70b
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-16 14:38:27 -04:00
Joey Hess
3d53cbc614
comment 2020-06-16 14:38:02 -04:00
yarikoptic
d7f05a328a Added a comment 2020-06-16 18:30:07 +00:00
Joey Hess
d4d0951c07
followup and break out todo item to prioritize 2020-06-16 14:25:51 -04:00
Joey Hess
3922f34f8e
comment 2020-06-16 14:16:02 -04:00
Joey Hess
ae90210295
response 2020-06-16 14:01:25 -04:00
Joey Hess
f0f1a23404
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-16 13:55:07 -04:00
Joey Hess
c4f2c56f5e
checkpresentkey: fix behavior to match documentation
checkpresentkey: When no remote is specified, try all remotes, not only
ones that the location log says contain the key. This is what the
documentation has always said it did.

Still try the logged remotes first, because they are far more likely to
have the key.
2020-06-16 13:54:26 -04:00
Joey Hess
f3010afbf6
improve docs and close incorrect bug report 2020-06-16 13:45:00 -04:00
Joey Hess
9f61cb94c0
comment 2020-06-16 12:53:10 -04:00
gb@4a49bb1afcf3d183bba8f07297b0395808768c6c
784d9032c2 Added a comment: Is IA.BAK still active? 2020-06-16 16:51:40 +00:00
Joey Hess
e360cc10cd
comment 2020-06-16 12:34:21 -04:00
https://dead-doomer.livejournal.com/
fc909493e5 Added a comment 2020-06-16 16:31:32 +00:00
https://dead-doomer.livejournal.com/
11a15eee2d Added a comment: How do I specify a merge command if I don't need separate branches? 2020-06-16 16:17:48 +00:00
https://dead-doomer.livejournal.com/
273a4b283e removed 2020-06-16 16:15:24 +00:00
Joey Hess
1f70ea119b
comment 2020-06-16 12:11:36 -04:00
https://dead-doomer.livejournal.com/
d370aff8dc Added a comment: How do I specify a merge command if I don't need separate branches? 2020-06-16 16:11:30 +00:00
kanakkshetri@9ea0e7639162bddc7bf9f3bb94cc32e93c793b89
6dac582f06 Mark as done 2020-06-15 11:44:20 +00:00
kanakkshetri@9ea0e7639162bddc7bf9f3bb94cc32e93c793b89
1e0dd34566 Added a comment 2020-06-15 11:42:41 +00:00
calmofthestorm
7c7f28ab79 Added a comment: Thanks, this does exactly what I want 2020-06-15 07:25:30 +00:00
calmofthestorm
d912685417 2020-06-15 05:25:37 +00:00
https://dead-doomer.livejournal.com/
a55f145ca8 Added a comment 2020-06-15 05:23:31 +00:00
Ilya_Shlyakhter
fe1f8a2e96 Added a comment 2020-06-15 04:38:04 +00:00
https://dead-doomer.livejournal.com/
1c12c22100 2020-06-15 01:38:42 +00:00
rst@aed0aded638b9b7cb3ef3c9aa5ee0a544042f0cf
6b3c0407d4 2020-06-13 02:25:55 +00:00
Ilya_Shlyakhter
c003237871 Added a comment: separate processes for parallel transfers 2020-06-12 15:47:28 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
70ac351da2 2020-06-12 13:04:54 +00:00
yarikoptic
e8edbe1ff3 Added a comment: stalls 2020-06-12 03:40:54 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
cd326962c8 Added a comment 2020-06-11 22:51:09 +00:00
Joey Hess
e5ec6609c0
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-11 17:47:16 -04:00
Joey Hess
69efc2c26b
comment 2020-06-11 17:36:17 -04:00
yarikoptic
c2f84a76bc Added a comment 2020-06-11 21:13:38 +00:00
Joey Hess
b60b8ecc78
clarify 2020-06-11 16:20:18 -04:00
Joey Hess
4e778ef849
response 2020-06-11 16:14:17 -04:00
Joey Hess
8a7c615a8f
import: Avoid using some strange names for temporary keys
The ContentIdentifier can contain almost anything, so could have characters
that are not fit for the filesystem, or might be longer than a key usually
is, or contain a newline, or .... genKeyName deals with those problems.

This should not present a back-compat issue, because this is a temporary
key used while downloading the imported file, before the real key for it
can be generated.
2020-06-11 16:07:36 -04:00
Joey Hess
0017d9a347
Merge branch 'master' of ssh://git-annex.branchable.com 2020-06-11 15:44:28 -04:00
Joey Hess
6b0cb2d732
defer cleaning keys db of old data
Avoid creating the keys database during init when there are no unlocked
files, to prevent init failing when sqlite does not work in the filesystem.
2020-06-11 15:40:13 -04:00
Joey Hess
d711dc31fa
response 2020-06-11 14:12:16 -04:00
Joey Hess
e15ab727eb
comment and todo 2020-06-11 14:05:01 -04:00