mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
extdiff: do not shell-quote options to new commands
revert a change introduced by c64ec6e8ffa2
This commit is contained in:
parent
005fbb4e58
commit
0658d7ce38
@ -105,8 +105,7 @@ def dodiff(ui, repo, diffcmd, diffopts, pats, opts):
|
|||||||
else:
|
else:
|
||||||
dir2 = snapshot_wdir(modified + added)
|
dir2 = snapshot_wdir(modified + added)
|
||||||
cmdline = ('%s %s %s %s' %
|
cmdline = ('%s %s %s %s' %
|
||||||
(util.shellquote(diffcmd),
|
(util.shellquote(diffcmd), ' '.join(diffopts),
|
||||||
' '.join(map(util.shellquote, diffopts)),
|
|
||||||
util.shellquote(dir1), util.shellquote(dir2)))
|
util.shellquote(dir1), util.shellquote(dir2)))
|
||||||
ui.debug('running %r in %s\n' % (cmdline, tmproot))
|
ui.debug('running %r in %s\n' % (cmdline, tmproot))
|
||||||
util.system(cmdline, cwd=tmproot)
|
util.system(cmdline, cwd=tmproot)
|
||||||
|
Loading…
Reference in New Issue
Block a user