This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D1908 python3: whitelist an additional 23 passing tests
Closed	durin42	D1907 tests: fix a missed b prefix in a test extension in test-strip.t
Closed	durin42	D1906 revlog: correct type in check to verify rawtext is immutable
Closed	durin42	D1903 mq: use bytes() instead of str() to encode statusentries for writing
Closed	durin42	D1902 mq: open status file et al in bytes mode
Closed	durin42	D1901 mq: fix up statusentry to be both repr()-able and bytes()-able
Closed	durin42	D1900 python3: whitelist another 7 passing tests
Closed	durin42	D1899 localrepo: pass transaction kwargs as strings, not bytes
Closed	durin42	D1898 localrepo: consistently use native str when __dict__ is involved
Closed	durin42	D1897 smartset: use native string when peeking in __dict__
Closed	durin42	D1896 obsolete: use native string when peeking in __dict__
Closed	durin42	D1895 lsprof: use native string when peeking in __dict__
Closed	durin42	D1894 dirstate: use native strings when peeking in __dict__
Closed	durin42	D1893 context: use native string when peeking in __dict__
Closed	durin42	D1892 bundlerepo: use native str when peeking in __dict__
Closed	durin42	D1891 transaction: fix hg version check when loading journal
Closed	durin42	D1890 branchmap: make error messages consistent between Python 2 and 3
Closed	durin42	D1889 tests: bytestring-ify all the adhoc extensions in test-strip.t
Closed	durin42	D1888 filemerge: fix regular expression pattern to be bytes
Closed	durin42	D1887 tags: explicitly grab list of dict keys
Closed	durin42	D1886 commands: replace map() with list comprehension
Closed	durin42	D1885 commands: rewrite legacy ternary operator hack using modern syntax
Closed	durin42	D1884 strip: use %d for known-int string interpolation
Closed	durin42	D1905 strip: use in-place revset formatspec instead of %-formatting ourselves
Closed	durin42	D1883 tests: get run-tests to reliably hand shellquote a string and not a bytes

Diff 4878

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)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4878		Jan 18 2018, 8:38 AM	★	★
Diff 2	5058	rHG3ebff846f7522a11216e292b168aa387cbd0fe2b	Jan 17 2018, 8:09 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

filemerge: fix regular expression pattern to be bytesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4878

mercurial/filemerge.py

filemerge: fix regular expression pattern to be bytes
ClosedPublic

Revision Contents
Changeset List