extensions: obsolete and remove interhg extension
With the addition of the websub filter extension this extension is no longer
needed. We maintain a sort of backwards compatibility by reading the [interhg]
section and using it as we would use the [websub] section.
--- a/mercurial/extensions.py Sat Feb 09 16:48:21 2013 +0100
+++ b/mercurial/extensions.py Sat Feb 09 11:00:42 2013 +0100
@@ -11,7 +11,7 @@
_extensions = {}
_order = []
-_ignore = ['hbisect', 'bookmarks', 'parentrevspec']
+_ignore = ['hbisect', 'bookmarks', 'parentrevspec', 'interhg']
def extensions():
for name in _order:
--- a/mercurial/hgweb/hgweb_mod.py Sat Feb 09 16:48:21 2013 +0100
+++ b/mercurial/hgweb/hgweb_mod.py Sat Feb 09 11:00:42 2013 +0100
@@ -264,6 +264,8 @@
def loadwebsub(self):
websubtable = []
websubdefs = self.repo.ui.configitems('websub')
+ # we must maintain interhg backwards compatibility
+ websubdefs += self.repo.ui.configitems('interhg')
for key, pattern in websubdefs:
# grab the delimiter from the character after the "s"
unesc = pattern[1]
--- a/tests/test-interhg.t Sat Feb 09 16:48:21 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
- $ "$TESTDIR/hghave" serve || exit 80
-
- $ hg init test
- $ cd test
-
- $ cat > .hg/hgrc <<EOF
- > [extensions]
- > interhg =
- >
- > [interhg]
- > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>|
- >
- > # yes, 'x' is a weird delimiter...
- > markbugs = sxbugx<i class="\x">bug</i>x
- > EOF
-
- $ touch foo
- $ hg add foo
- $ hg commit -d '1 0' -m 'Issue123: fixed the bug!'
-
- $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
- $ cat hg.pid >> $DAEMON_PIDS
-
-log
-
- $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT '' | grep bts
- <td class="description"><a href="/rev/1b0e7ece6bd6"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</a><span class="branchhead">default</span> <span class="tag">tip</span> </td>
-
-errors
-
- $ cat errors.log
-
- $ cd ..
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-websub.t Sat Feb 09 11:00:42 2013 +0100
@@ -0,0 +1,36 @@
+ $ "$TESTDIR/hghave" serve || exit 80
+
+ $ hg init test
+ $ cd test
+
+ $ cat > .hg/hgrc <<EOF
+ > [extensions]
+ > # this is only necessary to check that the mapping from
+ > # interhg to websub works
+ > interhg =
+ >
+ > [websub]
+ > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>|
+ >
+ > [interhg]
+ > # check that we maintain some interhg backwards compatibility...
+ > # yes, 'x' is a weird delimiter...
+ > markbugs = sxbugx<i class="\x">bug</i>x
+ > EOF
+
+ $ touch foo
+ $ hg add foo
+ $ hg commit -d '1 0' -m 'Issue123: fixed the bug!'
+
+ $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+ $ cat hg.pid >> $DAEMON_PIDS
+
+log
+
+ $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT "rev/tip" | grep bts
+ <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div>
+errors
+
+ $ cat errors.log
+
+ $ cd ..