Commit graph

30276 commits

Author SHA1 Message Date
Joey Hess
1f7da71a91
Merge branch 'master' of ssh://git-annex.branchable.com 2017-05-16 18:07:15 -04:00
Joey Hess
5bbb17b80c
run stack setup when building with stack
This gets ghc installed if it's not already.

Motivation: Ævar's git test that runs git-annex test using git
can be called with BUILDER=stack, but without stack setup being run
sometime, the stack build will fail.
2017-05-16 18:04:13 -04:00
Joey Hess
1d6ce176ad
update 2017-05-16 17:41:59 -04:00
Yurt
e68abacadb Added a comment: Encrypt to different subkeys? 2017-05-16 20:25:03 +00:00
Joey Hess
d90700bf37
devblog 2017-05-16 15:51:34 -04:00
Joey Hess
1d45e47e3f
clear regions before ssh prompt
When built with concurrent-output 1.9, ssh password prompts will no longer
interfere with the -J display.

To avoid flicker, only done when ssh actually does need to prompt;
ssh is first run in batch mode and if that succeeds the connection is up
and no need to clear regions.

This commit was supported by the NSF-funded DataLad project.
2017-05-16 15:50:11 -04:00
Joey Hess
89f9be3230
workaround is in place
(and remove debug print)
2017-05-16 14:36:54 -04:00
Joey Hess
9bcaef1ec4
Work around bug in git 2.13.0 involving GIT_COMMON_DIR that broke merging changes into adjusted branches.
Might want to remove this when it gets fixed, in case adjusted branches are
used in a repo with a great many refs, which would become unnecessarily
slow.

This commit was supported by the NSF-funded DataLad project.
2017-05-16 14:35:37 -04:00
Joey Hess
e858c959f7
glacier-cli python3 bug nearly for sure 2017-05-16 14:22:26 -04:00
Joey Hess
e0a8e3f414
forwardeed to git ML 2017-05-16 13:11:15 -04:00
Joey Hess
f32eef69e4
close dup 2017-05-16 12:20:40 -04:00
Joey Hess
0a92652d6b
Merge branch 'master' of ssh://git-annex.branchable.com 2017-05-16 12:20:01 -04:00
Joey Hess
67dd96c944
bisection 2017-05-16 12:19:02 -04:00
Joey Hess
7ec72e3874
optimisation
Avoids N^2 list traversal.
2017-05-16 11:33:53 -04:00
mail@4e627fd997ef5ca9f75e62ffc0aba5b27bd6aea1
23f79ee5d3 failing unit tests bug 2017-05-16 14:58:36 +00:00
Joey Hess
08eb87fc47
Merge branch 'master' of ssh://git-annex.branchable.com 2017-05-16 01:07:16 -04:00
Joey Hess
68299c4e0f
devblog 2017-05-16 01:05:53 -04:00
Joey Hess
a1730cd6af
adeiu, MissingH
Removed dependency on MissingH, instead depending on the split
library.

After laying groundwork for this since 2015, it
was mostly straightforward. Added Utility.Tuple and
Utility.Split. Eyeballed System.Path.WildMatch while implementing
the same thing.

Since MissingH's progress meter display was being used, I re-implemented
my own. Bonus: Now progress is displayed for transfers of files of
unknown size.

This commit was sponsored by Shane-o on Patreon.
2017-05-16 01:03:52 -04:00
Joey Hess
6dd806f1ad
stop using MissingH for MD5
Cryptonite is faster and allocates less, and I want to get rid of
MissingH use.

Note that the new dependency on memory is free; it's a dependency of
cryptonite.

This commit was supported by the NSF-funded DataLad project.
2017-05-15 21:36:03 -04:00
Joey Hess
44baa7b306
rename prompt since Messages added a function by that name 2017-05-15 21:35:56 -04:00
Joey Hess
18b9a4b802
remove absNormPathUnix again
Moving toward dropping MissingH dep.

I think I've addressed the problem identified earlier in
09a66f702d. On Windows,
absPathFrom "/tmp/repo/xxx" "y/bar" would be "/tmp/repo/xxx\\y/bar",
which then confuses relPathDirToFile. Fixed by converting to unix (git)
style paths.

Also, relPathDirToFile was splitting only on \\ on windows and not /
which broke the example in 09a66f702d of
relPathDirToFile (absPathFrom "/tmp/repo/xxx" "y/bar") "/tmp/repo/.git/annex/objects/xxx"

Now, on windows, that will yield "..\\..\\..\\.git/annex/objects/xxx"
which once converted to unix style paths is what we want.
2017-05-15 21:35:35 -04:00
http://id.clacke.se/
710071e49a 2017-05-16 00:13:36 +00:00
Joey Hess
e40d9a1b12
add Other-Extensions: TemplateHaskell
Fixes a build failure of stack build --profile.
See https://ghc.haskell.org/trac/ghc/ticket/8443
2017-05-15 16:50:03 -04:00
michal.anks@bff6982ee88f5bd889dd798be824cff38f2d8933
645e04368c glacier-cli and git-annex doesn't seem to work together right 2017-05-15 20:04:11 +00:00
Joey Hess
02ecf9a81f
update to lts-8.13 2017-05-15 16:01:24 -04:00
http://id.clacke.se/
acd825f5fd 2017-05-15 09:31:15 +00:00
leavingchicago@c04c893e78d1c4c76cb3e32b5c227cf42bbf7682
44a3f7207e Added a comment: Related... 2017-05-15 04:43:44 +00:00
leavingchicago@c04c893e78d1c4c76cb3e32b5c227cf42bbf7682
7ee0e9d816 2017-05-15 04:40:17 +00:00
justin.lebar@7a36fcafc322d9a381e89f08ab6289033c6dde91
9a772ee987 Add missing backtick around code 2017-05-14 23:51:40 +00:00
https://launchpad.net/~stephane-gourichon-lpad
ccabf1ed53 Describe issue, actions done, question. 2017-05-14 11:16:44 +00:00
ewen
b8c6eb557c Added a comment: dtruss OS X 10.11 git annex on SMB mount 2017-05-14 05:04:29 +00:00
t.z.mates
d7987ffc13 Added a comment 2017-05-13 20:59:34 +00:00
Joey Hess
2c6cfbe503
also serialize ssh password prompting when json or quiet output is enable 2017-05-13 13:13:13 -04:00
Joey Hess
1a0390e418
pointers 2017-05-12 16:29:53 -04:00
Joey Hess
e405b9bbe4
break out bug report 2017-05-12 10:57:58 -04:00
Joey Hess
9f11769455
misplaced comment 2017-05-12 10:38:22 -04:00
olaf
d1006a59b5 Added a comment 2017-05-11 23:45:36 +00:00
leavingchicago@c04c893e78d1c4c76cb3e32b5c227cf42bbf7682
65d6adbbe7 Added a comment 2017-05-11 23:23:45 +00:00
Joey Hess
0ec2f3b20f
rename to avoid name conflict 2017-05-11 18:31:14 -04:00
Joey Hess
3f4b671486
fix sshCleanup race using STM 2017-05-11 18:29:51 -04:00
Joey Hess
191665e7f0
devblog 2017-05-11 18:06:24 -04:00
Joey Hess
6992fe133b
Ssh password prompting improved when using -J
When ssh connection caching is enabled (and when GIT_ANNEX_USE_GIT_SSH is
not set), only one ssh password prompt will be made per host, and only one
ssh password prompt will be made at a time.

This also fixes a race in prepSocket's stale ssh connection stopping
when run with -J. It was possible for one thread to start a cached ssh
connection, and another thread to immediately stop it, resulting in excess
connections being made.

This commit was supported by the NSF-funded DataLad project.
2017-05-11 17:36:03 -04:00
Joey Hess
782c30b8a4
hmm 2017-05-11 16:45:30 -04:00
Joey Hess
db1600b2de
de-Maybe remoteGitConfig
It's always set, so does not need to be a Maybe.
2017-05-11 16:05:01 -04:00
Joey Hess
a6416ba232
improve comment 2017-05-11 14:37:24 -04:00
Joey Hess
838b55fa39
plan 2017-05-11 14:34:50 -04:00
Joey Hess
aec0627ea7
patchneeds to be sent to git 2017-05-11 13:30:15 -04:00
Joey Hess
9ddd75b99a
comment 2017-05-11 13:29:14 -04:00
Joey Hess
a7ea8b3a17
followup 2017-05-11 13:23:44 -04:00
Joey Hess
245f4251ef
response 2017-05-11 13:20:23 -04:00