Skip to content

Commit 222e7be

Browse files
local_replace.py: "hg cp"ied the new issues.roundup-tracker.org over to the responsive and devel templates as an improved example.
1 parent 287454b commit 222e7be

File tree

2 files changed

+26
-28
lines changed

2 files changed

+26
-28
lines changed

share/roundup/templates/devel/extensions/local_replace.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
'<a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=\g<id>">debian#\g<id></a>' ),
55
(re.compile('\#(?P<ws>\s*)(?P<id>\d+)'),
66
"<a href='issue\g<id>'>#\g<ws>\g<id></a>" ),
7-
(re.compile('(?P<prews>\s+)revision(?P<ws>\s*)(?P<revision>\d+)'),
8-
"\g<prews><a href='http://svn.roundup-tracker.org/view?rev=\g<revision>&view=rev'>revision\g<ws>\g<revision></a>"),
9-
(re.compile('(?P<prews>\s+)rev(?P<ws>\s*)(?P<revision>\d+)'),
10-
"\g<prews><a href='http://svn.roundup-tracker.org/view?rev=\g<revision>&view=rev'>rev\g<ws>\g<revision></a>"),
11-
(re.compile('(?P<prews>\s+)(?P<revstr>r|r\s+)(?P<revision>\d+)'),
12-
"\g<prews><a href='http://svn.roundup-tracker.org/view?rev=\g<revision>&view=rev'>\g<revstr>\g<revision></a>"),
7+
(re.compile('(?P<prews>^|\s+)(?P<revstr>(revision|rev|r)\s?)(?P<revision>[\da-fA-F]+)(?P<post>\W+|$)'),
8+
"\g<prews><a href='http://sourceforge.net/p/roundup/code/ci/\g<revision>'>\g<revstr>\g<revision></a>\g<post>"),
139
]
1410

1511
def local_replace(message):
@@ -18,18 +14,21 @@ def local_replace(message):
1814
message = cre.sub(replacement, message)
1915

2016
return message
21-
22-
23-
17+
18+
2419
def init(instance):
2520
instance.registerUtil('localReplace', local_replace)
26-
21+
2722

2823
if "__main__" == __name__:
2924
print " debian:#222", local_replace(" debian:#222")
25+
print " #555", local_replace(" #555")
3026
print " revision 222", local_replace(" revision 222")
31-
print " wordthatendswithr 222", local_replace(" wordthatendswithr 222")
32-
print " r222", local_replace(" r222")
3327
print " r 222", local_replace(" r 222")
34-
print " #555", local_replace(" #555")
35-
28+
print " wordthatendswithr 222", local_replace(" wordthatendswithr 222") # should fail
29+
print " references", local_replace(" references") # should fail
30+
print " too many spaces r 222", local_replace(" too many spaces r 222") # should fail
31+
print " r7140eb", local_replace(" r7140eb")
32+
print " rev7140eb ", local_replace(" rev7140eb ")
33+
print "rev7140eb", local_replace("rev7140eb")
34+
print "rev7140eb,", local_replace("rev7140eb,")

share/roundup/templates/responsive/extensions/local_replace.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
'<a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=\g<id>">debian#\g<id></a>' ),
55
(re.compile('\#(?P<ws>\s*)(?P<id>\d+)'),
66
"<a href='issue\g<id>'>#\g<ws>\g<id></a>" ),
7-
(re.compile('(?P<prews>\s+)revision(?P<ws>\s*)(?P<revision>\d+)'),
8-
"\g<prews><a href='http://svn.roundup-tracker.org/view?rev=\g<revision>&view=rev'>revision\g<ws>\g<revision></a>"),
9-
(re.compile('(?P<prews>\s+)rev(?P<ws>\s*)(?P<revision>\d+)'),
10-
"\g<prews><a href='http://svn.roundup-tracker.org/view?rev=\g<revision>&view=rev'>rev\g<ws>\g<revision></a>"),
11-
(re.compile('(?P<prews>\s+)(?P<revstr>r|r\s+)(?P<revision>\d+)'),
12-
"\g<prews><a href='http://svn.roundup-tracker.org/view?rev=\g<revision>&view=rev'>\g<revstr>\g<revision></a>"),
7+
(re.compile('(?P<prews>^|\s+)(?P<revstr>(revision|rev|r)\s?)(?P<revision>[\da-fA-F]+)(?P<post>\W+|$)'),
8+
"\g<prews><a href='http://sourceforge.net/p/roundup/code/ci/\g<revision>'>\g<revstr>\g<revision></a>\g<post>"),
139
]
1410

1511
def local_replace(message):
@@ -18,18 +14,21 @@ def local_replace(message):
1814
message = cre.sub(replacement, message)
1915

2016
return message
21-
22-
23-
17+
18+
2419
def init(instance):
2520
instance.registerUtil('localReplace', local_replace)
26-
21+
2722

2823
if "__main__" == __name__:
2924
print " debian:#222", local_replace(" debian:#222")
25+
print " #555", local_replace(" #555")
3026
print " revision 222", local_replace(" revision 222")
31-
print " wordthatendswithr 222", local_replace(" wordthatendswithr 222")
32-
print " r222", local_replace(" r222")
3327
print " r 222", local_replace(" r 222")
34-
print " #555", local_replace(" #555")
35-
28+
print " wordthatendswithr 222", local_replace(" wordthatendswithr 222") # should fail
29+
print " references", local_replace(" references") # should fail
30+
print " too many spaces r 222", local_replace(" too many spaces r 222") # should fail
31+
print " r7140eb", local_replace(" r7140eb")
32+
print " rev7140eb ", local_replace(" rev7140eb ")
33+
print "rev7140eb", local_replace("rev7140eb")
34+
print "rev7140eb,", local_replace("rev7140eb,")

0 commit comments

Comments
 (0)