Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Mon, 08 Nov 2010 17:29:23 -0600
changeset 12956 0406682c6905
parent 12954 85777aab7e08 (current diff)
parent 12955 158ca54a79cc (diff)
child 12957 9f2ac318b92e
merge with stable
--- a/tests/run-tests.py	Mon Nov 08 17:16:29 2010 -0600
+++ b/tests/run-tests.py	Mon Nov 08 17:29:23 2010 -0600
@@ -556,8 +556,9 @@
                 postout.append("  " + lout)
             elif (el and
                   (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or
-                   el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)) or
-                   el.endswith(" (esc)\n") and el.decode('string-escape') == l):
+                   el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)
+                   or el.endswith(" (esc)\n") and
+                      el.decode('string-escape') == l)):
                 postout.append("  " + el) # fallback regex/glob/esc match
             else:
                 if needescape(lout):
Mercurial