Mercurial > hg
comparison hgext/extdiff.py @ 9467:4c041f1ee1b4
do not attempt to translate ui.debug output
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 19 Sep 2009 01:15:38 +0200 |
| parents | a8fdcec4ab34 |
| children | e7bde4680eec |
comparison
equal
deleted
inserted
replaced
| 9466:1214c64c592b | 9467:4c041f1ee1b4 |
|---|---|
| 140 dir2 = os.path.join(dir2root, dir2, util.localpath(added[0])) | 140 dir2 = os.path.join(dir2root, dir2, util.localpath(added[0])) |
| 141 | 141 |
| 142 cmdline = ('%s %s %s %s' % | 142 cmdline = ('%s %s %s %s' % |
| 143 (util.shellquote(diffcmd), ' '.join(diffopts), | 143 (util.shellquote(diffcmd), ' '.join(diffopts), |
| 144 util.shellquote(dir1), util.shellquote(dir2))) | 144 util.shellquote(dir1), util.shellquote(dir2))) |
| 145 ui.debug(_('running %r in %s\n') % (cmdline, tmproot)) | 145 ui.debug('running %r in %s\n' % (cmdline, tmproot)) |
| 146 util.system(cmdline, cwd=tmproot) | 146 util.system(cmdline, cwd=tmproot) |
| 147 | 147 |
| 148 for copy_fn, working_fn, mtime in fns_and_mtime: | 148 for copy_fn, working_fn, mtime in fns_and_mtime: |
| 149 if os.path.getmtime(copy_fn) != mtime: | 149 if os.path.getmtime(copy_fn) != mtime: |
| 150 ui.debug(_('file changed while diffing. ' | 150 ui.debug('file changed while diffing. ' |
| 151 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn)) | 151 'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)) |
| 152 util.copyfile(copy_fn, working_fn) | 152 util.copyfile(copy_fn, working_fn) |
| 153 | 153 |
| 154 return 1 | 154 return 1 |
| 155 finally: | 155 finally: |
| 156 ui.note(_('cleaning up temp directory\n')) | 156 ui.note(_('cleaning up temp directory\n')) |