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

2101 commits

Author SHA1 Message Date
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
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
Joey Hess
b4bd3759f3 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-25 00:38:04 -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
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
5b7615ef0b 2013-05-24 22:03:16 +00:00
Joey Hess
c84538433a Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-24 12:46:57 -04:00
Joey Hess
56b774d358 close 2013-05-24 11:56:36 -04:00
http://joeyh.name/
09e362355c Added a comment 2013-05-24 15:50:45 +00:00
http://joeyh.name/
9526de5f68 Added a comment 2013-05-24 15:05:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmu416zAYgYzbXVZAe30MiXoOWO4z6nGX8
e0a6fe790c Added a comment 2013-05-24 14:59:54 +00:00
Joey Hess
7c1132f483 fixed 2013-05-24 10:31:15 -04:00
http://joeyh.name/
a4c41e3bcd Added a comment 2013-05-24 14:21:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlcxKZHglATIiJXD7jcxfYhkhgeFmcVFqE
03e7315c75 Added a comment: 21-May-2013 still broken 2013-05-24 12:00:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmu416zAYgYzbXVZAe30MiXoOWO4z6nGX8
3930841474 2013-05-24 08:12:56 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
0a62e9d3a9 2013-05-23 19:54:04 +00:00
http://joeyh.name/
387437e88c Added a comment 2013-05-23 15:59:37 +00:00
http://joeyh.name/
43aad96926 Added a comment 2013-05-23 15:57:08 +00:00
http://joeyh.name/
fbc3934b72 Added a comment 2013-05-23 15:55:16 +00:00
Joey Hess
cf96a69490 fixed 2013-05-23 11:32:44 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmu416zAYgYzbXVZAe30MiXoOWO4z6nGX8
03d3ddfe40 Added a comment 2013-05-23 10:02:55 +00:00
basak
712ec55776 2013-05-22 18:09:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnmvJtM53ZX9h8OGQoU2t2OfGwrF7rxFX0
50d76f48af Added a comment: fixed 2013-05-22 14:37:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawknOATcOkmzX4jKuET5Z2RsaFUNnLKnQsU
3433c47be3 2013-05-22 10:45:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlTdxM39-zofCTehLcLYJ8D-xH8pa5DNGA
75f4dd564d 2013-05-21 21:01:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawntVnR-Z5ghYInvsElbDeADPSuCsF18iTY
26b3822849 2013-05-21 08:22:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NYw8UF-NoDbKu8YKVGxi8FoZLH7JPs
deb6acfaba Added a comment: Same error with Android 2013-05-21 02:15:26 +00:00
Joey Hess
5819b18b32 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-20 17:44:38 -04:00
Joey Hess
82d5750e24 close 2013-05-20 17:44:16 -04:00
http://joeyh.name/
4f176badc7 Added a comment 2013-05-20 21:43:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
572080b65d Added a comment 2013-05-20 19:59:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
13514ebf2d Added a comment 2013-05-20 19:52:30 +00:00
http://joeyh.name/
e9794fb6ca Added a comment 2013-05-20 16:22:18 +00:00
http://joeyh.name/
3090327bc0 Added a comment 2013-05-20 16:09:47 +00:00
http://edheil.wordpress.com/
ff8026f4f9 Added a comment 2013-05-20 16:08:14 +00:00
http://joeyh.name/
0866364a0b Added a comment 2013-05-20 16:06:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
8af25edc8c Added a comment 2013-05-20 14:37:37 +00:00
http://edheil.wordpress.com/
c564e66e58 Added a comment 2013-05-20 13:57:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkx5V3MTbzCXS3J7Mn9FEq8M9bPPYMkAHY
29f30aa3b9 2013-05-20 12:40:55 +00:00
http://joeyh.name/
4186a6f40c Added a comment 2013-05-19 22:03:57 +00:00
Joey Hess
d5ba9cb728 Allow building with gpg2. 2013-05-19 17:59:58 -04:00
Joey Hess
29d8cc8b76 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 17:57:10 -04:00
http://me.tinco.nl/
05dad9325d Added a comment 2013-05-19 21:24:48 +00:00
Joey Hess
7b2bb513a0 moreinfo 2013-05-19 17:24:13 -04:00
http://joeyh.name/
cf9c7f3153 Added a comment 2013-05-19 21:13:41 +00:00
http://joeyh.name/
7a2fba971b Added a comment 2013-05-19 21:09:54 +00:00
Joey Hess
db6ff0f688 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-19 16:58:57 -04:00
Joey Hess
3f2739086e close; was wrong password 2013-05-19 16:57:47 -04:00
http://me.tinco.nl/
3fb592fe7e Added a comment 2013-05-19 20:45:53 +00:00