[PATCH] interhg: fixes regression introduced by 38170eeed18c

Wagner Bruna wagner.bruna+mercurial at gmail.com
Sat Feb 6 17:59:26 CST 2010


Hello,

Not on freeze yet, but anyway :-)  Enabling interhg for
all four tests is probably overkill, but I'm not sure on
which one it would be more appropriate.

Regards,
Wagner

# HG changeset patch
# User Wagner Bruna <wbruna at yahoo.com>
# Date 1265498702 7200
# Node ID dfb5251bbabb694573fa32a491c61c80553968aa
# Parent  66d954e76ffb621a4a54aad3705bb28528b71da9
interhg: fixes regression introduced by 38170eeed18c

diff --git a/hgext/interhg.py b/hgext/interhg.py
--- a/hgext/interhg.py
+++ b/hgext/interhg.py
@@ -40,7 +40,7 @@

 templatefilters.filters["escape"] = interhg_escape

-def interhg_refresh(orig, self):
+def interhg_refresh(orig, self, *args, **kwargs):
     interhg_table[:] = []
     for key, pattern in self.repo.ui.configitems('interhg'):
         # grab the delimiter from the character after the "s"
@@ -75,6 +75,6 @@
         except re.error:
             self.repo.ui.warn(_("interhg: invalid regexp for %s: %s\n")
                               % (key, regexp))
-    return orig(self)
+    return orig(self, *args, **kwargs)

 extensions.wrapfunction(hgweb_mod.hgweb, 'refresh', interhg_refresh)
diff --git a/tests/test-hgweb b/tests/test-hgweb
--- a/tests/test-hgweb
+++ b/tests/test-hgweb
@@ -3,6 +3,8 @@

 hg init test
 cd test
+echo "[extensions]" >> .hg/hgrc
+echo "interhg=" >> .hg/hgrc
 mkdir da
 echo foo > da/foo
 echo foo > foo
diff --git a/tests/test-hgweb-commands b/tests/test-hgweb-commands
--- a/tests/test-hgweb-commands
+++ b/tests/test-hgweb-commands
@@ -8,6 +8,8 @@
 echo % Set up the repo
 hg init test
 cd test
+echo "[extensions]" >> .hg/hgrc
+echo "interhg=" >> .hg/hgrc
 mkdir da
 echo foo > da/foo
 echo foo > foo
diff --git a/tests/test-hgweb-descend-empties b/tests/test-hgweb-descend-empties
--- a/tests/test-hgweb-descend-empties
+++ b/tests/test-hgweb-descend-empties
@@ -7,6 +7,8 @@
 echo % Set up the repo
 hg init test
 cd test
+echo "[extensions]" >> .hg/hgrc
+echo "interhg=" >> .hg/hgrc
 mkdir -p a1/a2/a3/a4
 mkdir -p b1/b2/b3/b4
 mkdir -p b1/b2/c3/c4
diff --git a/tests/test-hgweb-diffs b/tests/test-hgweb-diffs
--- a/tests/test-hgweb-diffs
+++ b/tests/test-hgweb-diffs
@@ -3,6 +3,8 @@
 echo % setting up repo
 hg init test
 cd test
+echo "[extensions]" >> .hg/hgrc
+echo "interhg=" >> .hg/hgrc
 echo a > a
 echo b > b
 hg ci -Ama



More information about the Mercurial-devel mailing list