Patchwork D1888: filemerge: fix regular expression pattern to be bytes

login
register
mail settings
Submitter phabricator
Date Feb. 1, 2018, 8:33 p.m.
Message ID <0cde35b6b063a75fc34bf7acbce6c4fb@localhost.localdomain>
Download mbox | patch
Permalink /patch/27125/
State Not Applicable
Headers show

Comments

phabricator - Feb. 1, 2018, 8:33 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG3ebff846f752: filemerge: fix regular expression pattern to be bytes (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1888?vs=4878&id=5058

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

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: durin42, #hg-reviewers, pulkit, indygreg
Cc: pulkit, mercurial-devel

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -529,7 +529,7 @@ 
             out = a
             a = repo.wvfs.join(back.path())
         replace = {'local': a, 'base': b, 'other': c, 'output': out}
-        args = util.interpolate(r'\$', replace, args,
+        args = util.interpolate(br'\$', replace, args,
                                 lambda s: util.shellquote(util.localpath(s)))
         cmd = toolpath + ' ' + args
         if _toolbool(ui, tool, "gui"):