Mercurial > hg > mercurial-crew-with-dirclash

comparison hgext/extdiff.py @ 3071:be98c5ce4022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
extdiff: do not shell-quote options to new commands revert a change introduced by 453097750fbf
author TK Soh <teekaysoh@yahoo.com>
date Mon, 28 Aug 2006 16:30:48 -0500
parents 7f5fc4b347de
children eeaf9bcdfa25
comparison
equal deleted inserted replaced
3070:24c1db20990c 3071:be98c5ce4022
103 if node2: 103 if node2:
104 dir2 = snapshot_node(modified + added, node2) 104 dir2 = snapshot_node(modified + added, node2)
105 else: 105 else:
106 dir2 = snapshot_wdir(modified + added) 106 dir2 = snapshot_wdir(modified + added)
107 cmdline = ('%s %s %s %s' % 107 cmdline = ('%s %s %s %s' %
108 (util.shellquote(diffcmd), 108 (util.shellquote(diffcmd), ' '.join(diffopts),
109 ' '.join(map(util.shellquote, diffopts)),
110 util.shellquote(dir1), util.shellquote(dir2))) 109 util.shellquote(dir1), util.shellquote(dir2)))
111 ui.debug('running %r in %s\n' % (cmdline, tmproot)) 110 ui.debug('running %r in %s\n' % (cmdline, tmproot))
112 util.system(cmdline, cwd=tmproot) 111 util.system(cmdline, cwd=tmproot)
113 return 1 112 return 1
114 finally: 113 finally: