Commit graph

29916 commits

Author SHA1 Message Date
Joey Hess
002513e194
test suite infra for testing mocked ssh remotes
This commit was supported by the NSF-funded DataLad project.
2017-03-17 19:14:41 -04:00
Joey Hess
d674fd5a69
super tricky shell command generation hack
GIT_SSH_COMMAND was not working correctly with git-annex get,
because when used in rsync -e, there were additional parameters
appended at the end, which the GIT_SSH_COMMAND should not see.

Fixed by constructing the shell command differently.

This commit was supported by the NSF-funded DataLad project.
2017-03-17 18:06:59 -04:00
Joey Hess
c9578be5b2
fix over-shell-escape
Seems I had one time too many.
2017-03-17 17:28:25 -04:00
Joey Hess
faecd73f32
Support GIT_SSH and GIT_SSH_COMMAND
They are handled close the same as they are by git. However, unlike git,
git-annex sometimes needs to pass the -n parameter when using these.

So, this has the potential for breaking some setup, and perhaps there ought
to be a ANNEX_USE_GIT_SSH=1 needed to use these. But I'd rather avoid that
if possible, so let's see if anyone complains.

Almost all places where "ssh" was run have been changed to support the env
vars. Anything still calling sshOptions does not support them. In
particular, rsync special remotes don't. Seems that annex-rsync-transport
already gives sufficient control there.

(Fixed in passing: Remote.Helper.Ssh.toRepo used to extract
remoteAnnexSshOptions and pass them to sshOptions, which was redundant
since sshOptions also extracts those.)

This commit was sponsored by Jeff Goeke-Smith on Patreon.
2017-03-17 16:20:37 -04:00
Joey Hess
8cd473c716
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-17 12:33:52 -04:00
Joey Hess
999743c1e8
git-annex-shell: run all commands with noMessages
Fix bug when used with a recently cloned repository, where
"merging" messages were included in the output of configlist (and perhaps
other commands) and caused a "Failed to get annex.uuid configuration"
error.

This does not seem to have been a reversion.

I saw this with configlist, but it seems possible for other commands to be
effected, and it might not always happen only after a fresh clone. Eg, if a
foo/git-annex branch is pushed to the remote, the next git-annex-shell will
auto-merge it and display the message.

Decided to run all git-annex-shell commands with noMessages,
even ones that don't currently use stdout for structured communication.
Better to keep open the possibility for using stdout in the future.

This commit was supported by the NSF-funded DataLad project
2017-03-17 12:32:43 -04:00
yarikoptic
60ad846c5c fixing ben 2017-03-17 13:34:36 +00:00
yarikoptic
75f4900c66 added Ben 2017-03-17 13:33:48 +00:00
Joey Hess
6f082a3d56
bug report 2017-03-17 00:22:19 -04:00
yarikoptic
461649c49d 2017-03-17 03:10:59 +00:00
Joey Hess
32e0aebeb8
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-16 16:56:52 -04:00
rok
9cef6529cd Added a comment: v6 default behavior 2017-03-16 09:24:51 +00:00
kubaello@d561f15ff5c07a78b706b096375cd89d6d706066
30d1e5b861 Added a comment 2017-03-16 01:22:44 +00:00
kubaello@d561f15ff5c07a78b706b096375cd89d6d706066
19b6e333af 2017-03-16 01:00:55 +00:00
yarikoptic
1bdc63124f tuned up rushed report 2017-03-16 00:01:25 +00:00
yarikoptic
a7759f0898 2017-03-15 23:55:05 +00:00
Joey Hess
8dd3470da0
comment 2017-03-14 19:45:28 -04:00
https://launchpad.net/~stephane-gourichon-lpad
96b6d21d52 Added a comment: Isn't this procedure assuming that lost+found contains only uncorrupted previously annexed files? 2017-03-14 19:15:40 +00:00
Horus
5fd02cf20c Added a comment 2017-03-14 08:58:54 +00:00
ryan@d4f0c2d3daacb5ec3a2945bca06f66decad4bfb5
148b25c00d 2017-03-14 02:09:59 +00:00
Joey Hess
a20b0e0003
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-13 16:33:28 -04:00
Joey Hess
3d001276df
close; not a bug in git-annex 2017-03-13 16:32:12 -04:00
Joey Hess
d1ecdd04b2
Windows: Fix bug in shell script shebang lookup code that caused a "delayed read on closed handle" error.
The bug was that withFile closes the handle afterwards, but the content
of the file was not read due to laziness. Using readFile avoids it.

This commit was sponsored by Nick Daly on Patreon.
2017-03-13 16:20:52 -04:00
hobbie123
d489834369 Added a comment: windows password 2017-03-13 06:28:15 +00:00
lee@7614f42c1a6cc84dbc813df25d2f75ed54948e17
5d3e7aaa75 initial post 2017-03-12 17:59:12 +00:00
Michel
f585521ad0 Added a comment: Solution 2017-03-11 00:44:19 +00:00
Joey Hess
1c4e5f65fc
Drop support for building with old versions of directory, feed, and http-types. 2017-03-10 15:57:41 -04:00
Joey Hess
9ef7207d5a
Revert "Drop support for building without network-uri."
This reverts commit fc3925a1cd.

Need it in stable w/o backports for the ancient autobuilder.
2017-03-10 15:49:18 -04:00
Joey Hess
ca49a84ba5
Drop support for building with old versions of dns and http-conduit. 2017-03-10 15:49:14 -04:00
Joey Hess
fc3925a1cd
Drop support for building without network-uri.
network-uri is available in Debian stable (backports) and testing,
so no need to complicate the cabal file anymore
2017-03-10 15:38:15 -04:00
Joey Hess
2ffd74c684
relicense Utility/GPG.hs BSD as the rest of Utility is
The COPYRIGHT had Utility/DirWatcher* listed as GPL, but they were
actually BSD licensed.

No idea why I put the GPL on Utility/GPG.hs file originally.
I wrote all of it, except for guilhem's small changes to it in
00fc21bfec, which seem too small to be
independently copyrightable. I'm relicencing it BSD.
2017-03-10 15:08:21 -04:00
Joey Hess
55b178a6ba
minor cleanup 2017-03-10 15:03:33 -04:00
Joey Hess
71a05b0d25
use ActionItem rather than String
This changes fsck -A warnings to include the name of the key,
which is a bit redundant in one case, but was missing in another case.
2017-03-10 14:13:10 -04:00
Joey Hess
c8e1e3dada
AssociatedFile newtype
To prevent any further mistakes like 301aff34c4

This commit was sponsored by Francois Marier on Patreon.
2017-03-10 13:35:31 -04:00
Joey Hess
2cd7496210
Merge branch 'master' of ssh://git-annex.branchable.com 2017-03-10 12:16:28 -04:00
Joey Hess
f90e2d0893
fix fsck bug introduced in 301aff34c4
Got two Maybe FilePaths crossed. Test suite caught it.
Slightly improved types to avoid this mistake.
2017-03-10 12:11:00 -04:00
CandyAngel
f68baf4ae6 Added a comment 2017-03-10 08:11:13 +00:00
Alan
9c7d71e4cb Added a comment: Issue still present 2017-03-10 07:32:16 +00:00
alanr
e62caf2e68 2017-03-10 03:21:16 +00:00
https://launchpad.net/~stephane-gourichon-lpad
1f16b41ec2 Added a comment: Work-in-progress, yet already usable, solution 2017-03-09 12:19:50 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
ce4c549235 2017-03-09 12:08:07 +00:00
Michel
26d6653a33 Added a comment: Thanks 2017-03-09 07:34:25 +00:00
archimedes
5cb3ec901a Added a comment 2017-03-08 22:36:14 +00:00
archimedes
2255c842ca Added a comment 2017-03-08 22:34:59 +00:00
jason.dixon.email@aa0e536a2ec2877d6f666108dbbc6e39bbe87ac0
e9654cb053 Added a comment: re: comment 3 2017-03-08 21:58:14 +00:00
Joey Hess
def8dbd586
remove unused import 2017-03-08 16:04:36 -04:00
Joey Hess
5358fb992a
Windows: Improve handling of shebang in external special remote program, searching for the program in the PATH.
findShellCommand needs a full path to a file in order to check it for a
shebang on Windows. It was being run with only the base name of the external
special remote program, which would only work when it was in the current
directory.

This is why users in
https://github.com/DanielDent/git-annex-remote-rclone/pull/10 and elsewhere
were complaining that the previous improvements to git-annex didn't make
git-remote-rclone work on Windows.

Also, reworked checkearlytermination, which while it worked, seemed
to rely on a race condition. And, improved its error messages.

This commit was sponsored by Shane-o on Patreon.
2017-03-08 15:59:00 -04:00
Joey Hess
0d1a1838c5
comment 2017-03-08 15:30:32 -04:00
Joey Hess
3b1bbb8202
comment 2017-03-08 15:19:08 -04:00
Joey Hess
301aff34c4
fsck -q: When a file has bad content, include the name of the file in the warning message.
This commit was sponsored by Alexander Thompson on Patreon.
2017-03-08 15:15:20 -04:00