Patchwork D6788: hgweb: fix websub regex flag syntax on Python 3

login
register
mail settings
Submitter phabricator
Date Sept. 10, 2019, 1:52 a.m.
Message ID <16442263f706b3beb3a86e2f860055f8@localhost.localdomain>
Download mbox | patch
Permalink /patch/41630/
State Not Applicable
Headers show

Comments

phabricator - Sept. 10, 2019, 1:52 a.m.
Closed by commit rHG6ccf539aec71: hgweb: fix websub regex flag syntax on Python 3 (authored by sheehan).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6788?vs=16466&id=16503

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6788/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6788

AFFECTED FILES
  mercurial/hgweb/webutil.py
  tests/test-websub.t

CHANGE DETAILS




To: sheehan, #hg-reviewers, indygreg
Cc: indygreg, mercurial-devel

Patch

diff --git a/tests/test-websub.t b/tests/test-websub.t
--- a/tests/test-websub.t
+++ b/tests/test-websub.t
@@ -11,16 +11,18 @@ 
   > 
   > [websub]
   > issues = s|Issue(\d+)|<a href="http://bts.example.org/issue\1">Issue\1</a>|
+  > tickets = s|ticket(\d+)|<a href="http://ticket.example.org/issue\1">Ticket\1</a>|i
   > 
   > [interhg]
   > # check that we maintain some interhg backwards compatibility...
   > # yes, 'x' is a weird delimiter...
   > markbugs = sxbugx<i class="\x">bug</i>x
+  > problems = sxPROBLEMx<i class="\x">problem</i>xi
   > EOF
 
   $ touch foo
   $ hg add foo
-  $ hg commit -d '1 0' -m 'Issue123: fixed the bug!'
+  $ hg commit -d '1 0' -m 'Issue123: fixed the bug! Ticket456 and problem789 too'
 
   $ hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
@@ -28,7 +30,7 @@ 
 log
 
   $ 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>
+  <div class="description"><a href="http://bts.example.org/issue123">Issue123</a>: fixed the <i class="x">bug</i>! <a href="http://ticket.example.org/issue456">Ticket456</a> and <i class="x">problem</i>789 too</div>
 errors
 
   $ cat errors.log
diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py
--- a/mercurial/hgweb/webutil.py
+++ b/mercurial/hgweb/webutil.py
@@ -791,7 +791,7 @@ 
         flagin = match.group(3)
         flags = 0
         if flagin:
-            for flag in flagin.upper():
+            for flag in pycompat.sysstr(flagin.upper()):
                 flags |= re.__dict__[flag]
 
         try: