Show More
@@ -164,13 +164,13 b' def dodiff(ui, repo, diffcmd, diffopts, ' | |||
|
164 | 164 | cmdline = ('%s %s %s %s' % |
|
165 | 165 | (util.shellquote(diffcmd), ' '.join(diffopts), |
|
166 | 166 | util.shellquote(dir1), util.shellquote(dir2))) |
|
167 | ui.debug('running %r in %s\n' % (cmdline, tmproot)) | |
|
167 | ui.debug(_('running %r in %s\n') % (cmdline, tmproot)) | |
|
168 | 168 | util.system(cmdline, cwd=tmproot) |
|
169 | 169 | |
|
170 | 170 | for copy_fn, working_fn, mtime in fns_and_mtime: |
|
171 | 171 | if os.path.getmtime(copy_fn) != mtime: |
|
172 | ui.debug('File changed while diffing. ' | |
|
173 | 'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)) | |
|
172 | ui.debug(_('File changed while diffing. ' | |
|
173 | 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn)) | |
|
174 | 174 | util.copyfile(copy_fn, working_fn) |
|
175 | 175 | |
|
176 | 176 | return 1 |
General Comments 0
You need to be logged in to leave comments.
Login now