# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1306549156 -3600
# Node ID fee93dd51b18e7cb88aa26638056e3c716dfd69b
# Parent  12a2b9b99beba9e45efaba5f091fa2195f9053c4# Parent  e763012a55e5680a91d7e3e7bd9a3c2a19cc4cfa
Merge with stable

diff -r 12a2b9b99beb -r fee93dd51b18 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu May 19 00:51:06 2011 +0200
+++ b/hgkw/keyword.py	Sat May 28 03:19:16 2011 +0100
@@ -595,11 +595,12 @@
                 wlock.release()
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, backend, mode,
-                         missing=False, eolmode=None):
+    def kwpatchfile_init(orig, self, ui, fname, backend, store, mode, create,
+                         remove, eolmode=None, copysource=None):
         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
         rejects or conflicts due to expanded keywords in working dir.'''
-        orig(self, ui, fname, backend, mode, missing, eolmode)
+        orig(self, ui, fname, backend, store, mode, create, remove,
+             eolmode, copysource)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)
 
diff -r 12a2b9b99beb -r fee93dd51b18 tests/run-tests.py
--- a/tests/run-tests.py	Thu May 19 00:51:06 2011 +0200
+++ b/tests/run-tests.py	Sat May 28 03:19:16 2011 +0100
@@ -733,11 +733,9 @@
     else:
         return None # not a supported test, don't record
 
-    if options.blacklist:
-        filename = options.blacklist.get(test)
-        if filename is not None:
-            skip("blacklisted")
-            return None
+    if options.blacklist and filename in options.blacklist:
+        skip("blacklisted")
+        return None
 
     if options.retest and not os.path.exists(test + ".err"):
         ignore("not retesting")
@@ -921,7 +919,11 @@
 
     optcopy = dict(options.__dict__)
     optcopy['jobs'] = 1
+
+    blacklist = optcopy['blacklist'] or []
     del optcopy['blacklist']
+    blacklisted = []
+
     if optcopy['with_hg'] is None:
         optcopy['with_hg'] = os.path.join(BINDIR, "hg")
     optcopy.pop('anycoverage', None)
@@ -943,7 +945,11 @@
         for job in jobs:
             if not tests:
                 break
-            job.append(tests.pop())
+            test = tests.pop()
+            if test in blacklist:
+                blacklisted.append(test)
+            else:
+                job.append(test)
     fps = {}
 
     for j, job in enumerate(jobs):
@@ -981,9 +987,12 @@
         vlog('pid %d exited, status %d' % (pid, status))
         failures |= status
     print
+    skipped += len(blacklisted)
     if not options.noskips:
         for s in skips:
             print "Skipped %s: %s" % (s[0], s[1])
+        for s in blacklisted:
+            print "Skipped %s: blacklisted" % s
     for s in fails:
         print "Failed %s: %s" % (s[0], s[1])