This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1888

filemerge: fix regular expression pattern to be bytes
ClosedPublic

Authored by durin42 on Jan 18 2018, 8:38 AM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHGc87926ebe096: filemerge: fix regular expression pattern to be bytes
rHG3ebff846f752: filemerge: fix regular expression pattern to be bytes
Summary
  1. skip-blame just a bytes prefix

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Jan 18 2018, 8:38 AM
pulkit added a subscriber: pulkit.Jan 18 2018, 8:51 AM

maybe #skip-blame?

durin42 edited the summary of this revision. (Show Details)Jan 18 2018, 11:12 AM
pulkit accepted this revision.Jan 18 2018, 12:10 PM
indygreg accepted this revision.Feb 1 2018, 3:32 PM
This revision is now accepted and ready to land.Feb 1 2018, 3:32 PM
Closed by commit rHG3ebff846f752: filemerge: fix regular expression pattern to be bytes (authored by durin42). · Explain WhyFeb 1 2018, 3:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (2 lines)

Diff 5058

mercurial/filemerge.py

ui = repo.ui ui = repo.ui
args = _toolstr(ui, tool, "args") args = _toolstr(ui, tool, "args")
if "$output" in args: if "$output" in args:
# read input from backup, write to original # read input from backup, write to original
out = a out = a
a = repo.wvfs.join(back.path()) a = repo.wvfs.join(back.path())
replace = {'local': a, 'base': b, 'other': c, 'output': out} 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))) lambda s: util.shellquote(util.localpath(s)))
cmd = toolpath + ' ' + args cmd = toolpath + ' ' + args
if _toolbool(ui, tool, "gui"): if _toolbool(ui, tool, "gui"):
repo.ui.status(_('running merge tool %s for file %s\n') % repo.ui.status(_('running merge tool %s for file %s\n') %
(tool, fcd.path())) (tool, fcd.path()))
repo.ui.debug('launching merge tool: %s\n' % cmd) repo.ui.debug('launching merge tool: %s\n' % cmd)
r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool') r = ui.system(cmd, cwd=repo.root, environ=env, blockedtag='mergetool')
repo.ui.debug('merge tool returned: %d\n' % r) repo.ui.debug('merge tool returned: %d\n' % r)