mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11273 commits 13 branches 442 tags 103 MiB
Commit graph

11273 commits

This branch
This branch
All branches
Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
a729fe7401 2013-05-26 19:50:45 +00:00
Joey Hess
129be9cf68 more windows fixes 2013-05-26 11:12:34 -04:00
Joey Hess
b80d5494c4 typo 2013-05-26 11:08:18 -04:00
Joey Hess
1964bf4066 fix windows build 2013-05-26 11:05:31 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
fc6535ddd8 Added a comment 2013-05-26 13:50:31 +00:00
annexuser
847596e9c9 Added a comment 2013-05-25 22:58:16 +00:00
Joey Hess
fc37456d0f fuzz test discovered a way automatic merge resultion can fail; fix 
It may be that the directory we need to make a symlink in, to resolve the
merge, doesn't exist locally.
 2013-05-25 18:42:43 -04:00
Joey Hess
33fe3dac9e fuzz tester: avoid deleting entire repository (had to happen eventually, right?) 2013-05-25 18:15:34 -04:00
Joey Hess
377bc7bbb7 fix 2013-05-25 17:55:31 -04:00
Joey Hess
ce0ee2aa44 fuzz improvements 2013-05-25 17:52:33 -04:00
Joey Hess
2c5175b81f Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-25 17:19:32 -04:00
Joey Hess
4dc61d74c9 tune frequencies to avoid enormous trees being created 2013-05-25 17:18:37 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o
44b0039e6e Added a comment 2013-05-25 20:27:32 +00:00
Joey Hess
90069a32c2 blog for the days 2013-05-25 16:08:29 -04:00
Joey Hess
8b5b4522d1 make fuzz test also output its actions to stdout 2013-05-25 15:52:28 -04:00
Joey Hess
564350ff90 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-25 15:24:35 -04:00
Joey Hess
3b1aedea3d Merge branch 'robustness' 2013-05-25 15:22:18 -04:00
Joey Hess
5eeea0fac9 make direct mode merge cleanup more robust 
If the cleanup of a single file fails for some reason, continue
to clean up other files.

This could happen because of a race. The merge pulls in a change to a file,
which gets changed locally at the same time.
 2013-05-25 15:22:16 -04:00
Joey Hess
bf86b5ca16 improve robustness of fromDirect and replaceFile 
Made fromDirect check that a file in the tree has good content (and is not
a broken symlink either) before copying it to another file that has the
same key.

Made replaceFile clean up the temp file if the action that creates it, or
the file replacement action fails.
 2013-05-25 15:06:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
d36aa25b8f Added a comment 2013-05-25 19:01:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs
7298f95a76 Added a step I had to do on my own OS X machine with 10.6 in order for the build to work. 2013-05-25 18:36:37 +00:00
Joey Hess
c8a749499d Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-25 13:59:37 -04:00
http://joeyh.name/
9d8ce10ee3 Added a comment 2013-05-25 17:57:43 +00:00
Joey Hess
09edbd5df2 some basic tests of preferred content expressions and standard groups 2013-05-25 13:51:36 -04:00
Joey Hess
baf36cb0cc forgot to add 2013-05-25 13:51:27 -04:00
Joey Hess
d4234b461b fix handling of Not in the matcher 2013-05-25 13:50:27 -04:00
Joey Hess
b276857a7a content: New command line way to view and configure a repository's preferred content settings. 2013-05-25 12:44:58 -04:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
9c4d113663 Added a comment: bind mount 2013-05-25 15:55:52 +00:00
http://yarikoptic.myopenid.com/
4dcebfd8b5 Added a comment: Few other issues 2013-05-25 15:35:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkF8_uQjLYm5Mf5F_JuVW-BxlvzpWjvR_o
9784587bad Added a comment: Wheezy is affected 2013-05-25 12:00:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
e753551506 Added a comment 2013-05-25 10:03:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC0
7d5df365b2 Added a comment: It did it again. 2013-05-25 09:31:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
98a9eede08 Added a comment 2013-05-25 07:40:13 +00:00
http://yarikoptic.myopenid.com/
7f4f53b065 Added a comment: compressed storage/transfer -- gzip Content-Type 2013-05-25 06:41:37 +00:00
Joey Hess
e3c1586997 Improve error handling when getting uuid of http remotes to auto-ignore, like with ssh remotes. 2013-05-25 01:47:19 -04:00
http://joeyh.name/
b63d5e6b1d Added a comment 2013-05-25 04:42:22 +00:00
Joey Hess
b4bd3759f3 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-25 00:38:04 -04:00
Joey Hess
729eab1f89 assistant: Work around git-cat-file's not reloading the index after files are staged. 
Argh.
 2013-05-25 00:37:41 -04:00
Joey Hess
ed4febb170 remove debug print 2013-05-25 00:02:39 -04:00
Joey Hess
2b14fe2c98 refactor 2013-05-24 23:07:26 -04:00
Joey Hess
f8e940eb8e Fix bug in parsing of parens in some preferred content expressions. This fixes the behavior of the manual mode group. 
The current manual mode preferred content expression is:

"present and (((exclude=*/archive/* and exclude=archive/*) or (not (copies=archive:1 or copies=smallarchive:1))) or (not copies=semitrusted+:1))"

The old matcher misparsed this, to basically:

OR (present and (...)) (not copies=semitrusted+:1))

The paren handling and indeed the whole conversion from tokens to the
matcher was just wrong. The new way may not be the cleverest, but I think
it is correct, and you can see how it pattern matches structurally against
the expressions when parsing them.

That expression is now parsed to:

MAnd (MOp <function>)
  (MOr (MOr (MAnd (MOp <function>) (MOp <function>)) (MNot (MOr (MOp <function>) (MOp <function>))))
    (MNot (MOp <function>)))

Which appears correct, and behaves correct in testing.

Also threw in a simplifier, so the final generated Matcher has less
unnecessary clutter in it. Mostly so that I could more easily read &
confirm them.

Also, added a simple test of the Matcher to the test suite.

There is a small chance of badly formed preferred content expressions
behaving differently than before due to this rewrite.
 2013-05-24 21:46:33 -04:00
http://a-or-b.myopenid.com/
0eab1b091b removed 2013-05-25 00:48:44 +00:00
http://a-or-b.myopenid.com/
93579dea2f 2013-05-25 00:41:48 +00:00
http://yarikoptic.myopenid.com/
38b8a1539b Added a comment: asking for ssh password in the terminal (not in web ui) 2013-05-24 23:49:40 +00:00
http://yarikoptic.myopenid.com/
af0b93086a Added a comment: It starts after uninstall/install 2013-05-24 23:29:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
5b7615ef0b 2013-05-24 22:03:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
4d34233fae Added a comment 2013-05-24 21:31:47 +00:00
Joey Hess
c84538433a Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-24 12:46:57 -04:00
http://joeyh.name/
a883a95726 Added a comment 2013-05-24 16:45:27 +00:00
Joey Hess
b7ccbfcc15 note about initremote --fast 2013-05-24 12:12:00 -04:00