Show More
@@ -11,7 +11,7 b' from i18n import _, gettext' | |||||
11 |
|
11 | |||
12 | _extensions = {} |
|
12 | _extensions = {} | |
13 | _order = [] |
|
13 | _order = [] | |
14 | _ignore = ['hbisect', 'bookmarks', 'parentrevspec'] |
|
14 | _ignore = ['hbisect', 'bookmarks', 'parentrevspec', 'interhg'] | |
15 |
|
15 | |||
16 | def extensions(): |
|
16 | def extensions(): | |
17 | for name in _order: |
|
17 | for name in _order: |
@@ -264,6 +264,8 b' class hgweb(object):' | |||||
264 | def loadwebsub(self): |
|
264 | def loadwebsub(self): | |
265 | websubtable = [] |
|
265 | websubtable = [] | |
266 | websubdefs = self.repo.ui.configitems('websub') |
|
266 | websubdefs = self.repo.ui.configitems('websub') | |
|
267 | # we must maintain interhg backwards compatibility | |||
|
268 | websubdefs += self.repo.ui.configitems('interhg') | |||
267 | for key, pattern in websubdefs: |
|
269 | for key, pattern in websubdefs: | |
268 | # grab the delimiter from the character after the "s" |
|
270 | # grab the delimiter from the character after the "s" | |
269 | unesc = pattern[1] |
|
271 | unesc = pattern[1] |
@@ -5,11 +5,15 b'' | |||||
5 |
|
5 | |||
6 | $ cat > .hg/hgrc <<EOF |
|
6 | $ cat > .hg/hgrc <<EOF | |
7 | > [extensions] |
|
7 | > [extensions] | |
|
8 | > # this is only necessary to check that the mapping from | |||
|
9 | > # interhg to websub works | |||
8 | > interhg = |
|
10 | > interhg = | |
9 | > |
|
11 | > | |
|
12 | > [websub] | |||
|
13 | > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>| | |||
|
14 | > | |||
10 | > [interhg] |
|
15 | > [interhg] | |
11 | > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>| |
|
16 | > # check that we maintain some interhg backwards compatibility... | |
12 | > |
|
|||
13 |
> # |
|
17 | > # yes, 'x' is a weird delimiter... | |
14 | > markbugs = sxbugx<i class="\x">bug</i>x |
|
18 | > markbugs = sxbugx<i class="\x">bug</i>x | |
15 | > EOF |
|
19 | > EOF | |
@@ -23,9 +27,8 b'' | |||||
23 |
|
27 | |||
24 | log |
|
28 | log | |
25 |
|
29 | |||
26 |
$ "$TESTDIR/get-with-headers.py" localhost:$HGPORT |
|
30 | $ "$TESTDIR/get-with-headers.py" localhost:$HGPORT "rev/tip" | grep bts | |
27 |
|
|
31 | <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>!</div> | |
28 |
|
||||
29 | errors |
|
32 | errors | |
30 |
|
33 | |||
31 | $ cat errors.log |
|
34 | $ cat errors.log |
General Comments 0
You need to be logged in to leave comments.
Login now