Mercurial > hg-stable

comparison hgext/extdiff.py @ 6957:bd979854a388

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: mark strings for translation in extdiff extension
author Martin Geisler <mg@daimi.au.dk>
date Sun, 31 Aug 2008 16:12:02 +0200
parents 4faaa0535ea7
children e05aa73ce2b7
comparison
equal deleted inserted replaced
6956:12472a240398 6957:bd979854a388
162 dir2 = os.path.join(dir2root, dir2, util.localpath(added[0])) 162 dir2 = os.path.join(dir2root, dir2, util.localpath(added[0]))
163 163
164 cmdline = ('%s %s %s %s' % 164 cmdline = ('%s %s %s %s' %
165 (util.shellquote(diffcmd), ' '.join(diffopts), 165 (util.shellquote(diffcmd), ' '.join(diffopts),
166 util.shellquote(dir1), util.shellquote(dir2))) 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 util.system(cmdline, cwd=tmproot) 168 util.system(cmdline, cwd=tmproot)
169 169
170 for copy_fn, working_fn, mtime in fns_and_mtime: 170 for copy_fn, working_fn, mtime in fns_and_mtime:
171 if os.path.getmtime(copy_fn) != mtime: 171 if os.path.getmtime(copy_fn) != mtime:
172 ui.debug('File changed while diffing. ' 172 ui.debug(_('File changed while diffing. '
173 'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn)) 173 'Overwriting: %s (src: %s)\n') % (working_fn, copy_fn))
174 util.copyfile(copy_fn, working_fn) 174 util.copyfile(copy_fn, working_fn)
175 175
176 return 1 176 return 1
177 finally: 177 finally:
178 ui.note(_('cleaning up temp directory\n')) 178 ui.note(_('cleaning up temp directory\n'))