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

login
register
mail settings
Submitter phabricator
Date Jan. 18, 2018, 1:38 p.m.
Message ID <differential-rev-PHID-DREV-w23zymtwuztlt7yiifhw-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/26874/
State Superseded
Headers show

Comments

phabricator - Jan. 18, 2018, 1:38 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/filemerge.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel
phabricator - Jan. 18, 2018, 1:51 p.m.
pulkit added a comment.


  maybe #skip-blame?

REPOSITORY
  rHG Mercurial

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

To: durin42, #hg-reviewers
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"):