Commit graph

11228 commits

Author SHA1 Message Date
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
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
Joey Hess
4da2ae009a tag 2013-05-24 12:01:25 -04:00
Joey Hess
84ac6778d9 update 2013-05-24 11:59:52 -04:00
Joey Hess
56b774d358 close 2013-05-24 11:56:36 -04:00
http://joeyh.name/
ff9c7c7278 Added a comment 2013-05-24 15:55:42 +00:00
http://joeyh.name/
09e362355c Added a comment 2013-05-24 15:50:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
ac04b22893 Added a comment 2013-05-24 15:47:36 +00:00
basak
27820b5efa Added a comment 2013-05-24 15:47:14 +00:00
Joey Hess
a3b50a9673 fix log filename 2013-05-24 11:39:10 -04:00
http://joeyh.name/
b8310c2eda Added a comment 2013-05-24 15:35:16 +00:00
http://joeyh.name/
aa90cd782c Added a comment 2013-05-24 15:33:12 +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
Joey Hess
e5b3739bea further restrict yesod versions, for people who have newer stuff installed 2013-05-24 10:25:39 -04:00
http://joeyh.name/
a4c41e3bcd Added a comment 2013-05-24 14:21:04 +00:00
http://mildred.fr/
b87fe0d611 Added a comment: Problems with URL ending with ".git" 2013-05-24 12:15:16 +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
basak
e055ed4a08 Added a comment 2013-05-24 09:38:40 +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=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
d60d2a6038 2013-05-24 06:15:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkwjBDXkP9HAQKhjTgThGOxUa1B99y_WRA
aee0f94fc8 Added a comment: Still problems with my old N1/CM7 2013-05-24 06:01:19 +00:00
http://joeyh.name/
6142a1ff93 Added a comment 2013-05-24 03:26:33 +00:00
http://yarikoptic.myopenid.com/
04d2c84292 Added a comment: fresh build 2013-05-24 03:21:29 +00:00
http://yarikoptic.myopenid.com/
1f990a56a9 Added a comment 2013-05-24 03:11:50 +00:00
Joey Hess
dbd742fd91 gar 2013-05-23 19:29:48 -04:00
Joey Hess
2576051021 better descriptions 2013-05-23 19:28:45 -04:00
http://joeyh.name/
33ee532851 2013-05-23 23:26:28 +00:00
http://joeyh.name/
402e3d010c Added a comment 2013-05-23 23:25:02 +00:00
Joey Hess
3c7d7a73d5 Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-23 19:18:49 -04:00
Joey Hess
f3640baca0 blog for the day 2013-05-23 19:16:29 -04:00
Joey Hess
a96e982bd3 fuzz tester 2013-05-23 19:00:46 -04:00
Joey Hess
2a7295dbba add googledriveannex 2013-05-23 18:52:19 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC0
7c4ff7667c 2013-05-23 21:45:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC0
c7077c7367 2013-05-23 21:20:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlQ7ZdQxAps4v0cl5J3wKGWD8243Gy8-m0
2ef63c6d80 Added a comment: PPA Package Pinning 2013-05-23 21:18:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmLB39PC89rfGaA8SwrsnB6tbumezj-aC0
4df5265bc2 2013-05-23 21:07:43 +00:00
http://joeyh.name/
8187a79b50 Added a comment 2013-05-23 20:04:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkBwMWvNKZZCge_YqobCSILPMeK6xbFw8
0a62e9d3a9 2013-05-23 19:54:04 +00:00
Joey Hess
cf7fec4b46 list standard groups in vicfg 2013-05-23 14:54:59 -04:00
http://joeyh.name/
6c06a4f8eb Added a comment 2013-05-23 18:44:47 +00:00
Joey Hess
cfe07a2573 enable test command on windows
(test suite already enabled; this just enables help test)
2013-05-23 14:12:06 -04:00
Joey Hess
f07cdf88ba remove disk space usage note
Using symlinks should avoid this Android bug.
2013-05-23 13:56:53 -04:00
Joey Hess
ff3640acad Merge branch 'master' of ssh://git-annex.branchable.com 2013-05-23 13:55:25 -04:00
Joey Hess
4713f0c89d Android app: Avoid using hard links to app's lib directory, which is sometimes on a different filesystem than the data directory.
Assumes symlinks work on all android. If not, this would need to be adapted
to try both. This worked for me.
2013-05-23 13:54:49 -04:00
http://joeyh.name/
387437e88c Added a comment 2013-05-23 15:59:37 +00:00