Mercurial Mercurial > mercurial / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/extdiff.py
changeset 30982 08e6f4dac2ca
parent 30678 caf7e1c5efe4
child 31451 53865692a354
equal deleted inserted replaced
30981:a0c4e57074fe 30982:08e6f4dac2ca 
   271         if not do3way and not re.search(regex, cmdline):
 
   271         if not do3way and not re.search(regex, cmdline):
 
   272             cmdline += ' $parent1 $child'
 
   272             cmdline += ' $parent1 $child'
 
   273         cmdline = re.sub(regex, quote, cmdline)
 
   273         cmdline = re.sub(regex, quote, cmdline)
 
   274 
   274 
   275         ui.debug('running %r in %s\n' % (cmdline, tmproot))
 
   275         ui.debug('running %r in %s\n' % (cmdline, tmproot))
 
   276         ui.system(cmdline, cwd=tmproot)
 
   276         ui.system(cmdline, cwd=tmproot, blockedtag='extdiff')
 
   277 
   277 
   278         for copy_fn, working_fn, mtime in fns_and_mtime:
 
   278         for copy_fn, working_fn, mtime in fns_and_mtime:
 
   279             if os.lstat(copy_fn).st_mtime != mtime:
 
   279             if os.lstat(copy_fn).st_mtime != mtime:
 
   280                 ui.debug('file changed while diffing. '
 
   280                 ui.debug('file changed while diffing. '
 
   281                          'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn))
 
   281                          'Overwriting: %s (src: %s)\n' % (working_fn, copy_fn))
mercurial