Commit graph

12823 commits

Author SHA1 Message Date
Joey Hess
1452ac38aa release notes 2013-08-02 13:41:28 -04:00
Joey Hess
61a327cf93 add news item for git-annex 4.20130802 2013-08-02 13:39:43 -04:00
Joey Hess
7fdf9ea5dd releasing version 4.20130802 2013-08-02 13:38:18 -04:00
Joey Hess
dc3e0725f9 improve error message 2013-08-02 13:01:25 -04:00
Joey Hess
0a52f02f8e fix syntax 2013-08-02 12:42:14 -04:00
Joey Hess
7280f7b5bc Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-02 12:38:28 -04:00
Joey Hess
da012e1eeb fix Windows breakage 2013-08-02 12:37:45 -04:00
Joey Hess
eba74e3940 fix build with old yesod 2013-08-02 12:32:16 -04:00
Joey Hess
93f2371e09 get rid of __WINDOWS__, use mingw32_HOST_OS
The latter is harder for me to remember, but avoids build failures in code
used by the configure program.
2013-08-02 12:27:32 -04:00
Joey Hess
022c3910e9 Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-02 11:36:39 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
f946fd31c9 Added a comment: re: git annex get failed -- debug 2013-08-02 15:28:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
c6d7b05a48 Added a comment: re: git annex get failed 2013-08-02 15:02:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnaH44G3QbxBAYyDwy0PbvL0ls60XoaR3Y
1ddb25cadb Added a comment: git annex get failed 2013-08-02 14:29:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
7a566a332f 2013-08-02 13:41:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
60ecabd8ba Added a comment 2013-08-02 07:21:50 +00:00
Richard Hartmann
24cd572a7c Sometimes, I dislike MarkDown 2013-08-02 09:02:45 +02:00
Richard Hartmann
4bd5b920c7 Fix indentation 2013-08-02 08:59:30 +02:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e98d1d6ac1 Added a comment 2013-08-02 06:57:13 +00:00
http://joeyh.name/
c88bbc47ce Added a comment 2013-08-01 23:51:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnWvnTWY6LrcPB4BzYEBn5mRTpNhg5EtEg
0bb455dcae Added a comment: checkpresent again 2013-08-01 23:18:38 +00:00
Joey Hess
e6123b0187 reorder 2013-08-01 17:57:53 -04:00
Joey Hess
bb74db6ef0 blog for the day 2013-08-01 17:33:04 -04:00
Joey Hess
d16114d024 Slow and ugly work around for bug #718517 in git, which broke git-cat-file --batch for filenames containing spaces.
This runs git-cat-file in non-batch mode for all files with spaces.
If a directory tree has a lot of them, and is in direct mode, even "git
annex add" when there are few new files will need a *lot* of forks!

The only reason buffering the whole file content to get the sha is not a
memory leak is that git-annex only ever uses this on symlinks.

This needs to be reverted as soon as a fix is available in git!
2013-08-01 17:30:47 -04:00
Joey Hess
4e6f498cb8 update 2013-08-01 15:25:47 -04:00
Joey Hess
82b08688e2 Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-01 15:16:22 -04:00
Joey Hess
ebd778c519 Escape ':' in file/directory names to avoid it being treated as a pathspec by some git commands
A git pathspec is a filename, except when it starts with ':', it's taken
to refer to a branch, etc. Rather than special case ':', any filename
starting with anything unusual is prefixed with "./"

This could have been a real mess to deal with, but luckily SafeCommand
is already extensively used and so we know at the type level the difference
between parameters that are files, and parameters that are command options.

Testing did show that Git.Queue was not using SafeCommand on
filenames fed to xargs. (Filenames starting with '-' worked before only
because -- was used to separate filenames from options when calling eg git
add.)

The test suite now passes with filenames starting with ':'. However, I did
not keep that change to it, because such filenames are probably not legal
on windows, and I have enough ugly windows ifdefs in there as it is.

This commit was sponsored by Otavio Salvador. Thanks!
2013-08-01 15:15:49 -04:00
http://joeyh.name/
ebef73985e Added a comment 2013-08-01 17:10:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM
4f7bfbb2ec Added a comment: Thanks 2013-08-01 17:03:23 +00:00
http://joeyh.name/
53b77590d7 Added a comment 2013-08-01 16:58:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM
5a0e741a44 Added a comment: Just put multiple source files 2013-08-01 16:29:07 +00:00
http://joeyh.name/
aa337f990c Added a comment 2013-08-01 16:06:42 +00:00
http://joeyh.name/
7e06571454 Added a comment 2013-08-01 16:05:10 +00:00
Joey Hess
904f776a2f Merge branch 'master' of ssh://git-annex.branchable.com 2013-08-01 12:03:48 -04:00
Joey Hess
03c76b5a30 improve importfeed --force; try to match existing files to avoid unncessary duplication 2013-08-01 11:57:05 -04:00
ckeen
4973b8c9db Added a comment: --force reload all URLs 2013-08-01 09:47:35 +00:00
https://launchpad.net/~mikapflueger
b640a5941b Added a comment: Thank you so much! 2013-08-01 01:13:53 +00:00
Richard Hartmann
0afe0273cb Typo 2013-08-01 01:16:27 +02:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
febb7a8299 2013-07-31 22:39:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln4uCaqZRd5_nRQ-iLcJyGctIdw8ebUiM
d40343f7a5 2013-07-31 22:19:22 +00:00
Joey Hess
12e269482f Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-31 16:48:41 -04:00
Joey Hess
88b1a3e54e close 2013-07-31 16:48:35 -04:00
Joey Hess
3a1e458e0a blog for the day 2013-07-31 16:47:30 -04:00
http://joeyh.name/
166128760d Added a comment 2013-07-31 20:42:10 +00:00
Joey Hess
899c3083e8 Merge branch 'master' of ssh://git-annex.branchable.com 2013-07-31 16:37:53 -04:00
Joey Hess
d1ed337035 webapp: Improve handling of remotes whose setup has stalled.
This includes recovery from the ssh-agent problem that led to many reporting
http://git-annex.branchable.com/bugs/Internal_Server_Error:_Unknown_UUID/
(Including fixing up .ssh/config to set IdentitiesOnly.)

Remotes that have no known uuid are now displayed in the webapp as
"unfinished". There's a link to check their status, and if the remote
has been set annex-ignore, a retry button can be used to unset that and
try again to set up the remote.

As this bug has shown, the process of adding a ssh remote has some failure
modes that are not really ideal. It would certianly be better if, when
setting up a ssh remote it would detect if it's failed to get the UUID,
and handle that in the remote setup process, rather than waiting until
later and handling it this way.

However, that's hard to do, particularly for local pairing, since the
PairListener runs as a background thread. The best it could do is pop up an
alert if there's a problem. This solution is not much different.

Also, this solution handles cases where the user has gotten their repo into
a mess manually and let's the assistant help with cleaning it up.

This commit was sponsored by Chia Shee Liang. Thanks!
2013-07-31 16:36:29 -04:00
http://joeyh.name/
890bf1a750 Added a comment 2013-07-31 20:03:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
9545d3420c Added a comment: Horns? 2013-07-31 19:53:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
209a0ca0fa removed 2013-07-31 19:53:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU
3cce0d51e6 Added a comment: Horns? 2013-07-31 19:52:42 +00:00
Joey Hess
ab62ae357a hide NoUUID remotes from repolist
A ssh remote will breifly have NoUUID when it's just being set up and
git-annex-shell has not yet been queried for the UUID. So it doesn't make
sense to display any kind of error message in this case. The UI doesn't
work when there's NoUUID, and it can even crash the ajax long polling code.
So hiding NoUUID repositories is the right thing to do.

I've tested and the automatic refresh of the repolist causes the remote
to show up as soon as a UUID is recorded, when doing local pairing, and
when adding a ssh remote.
2013-07-31 14:31:05 -04:00