Mercurial > hg
comparison hgext/extdiff.py @ 36268:be5a6fe3643a
py3: make test-extdiff.t pass on Python 3
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 17 Feb 2018 18:20:15 +0900 |
| parents | 08f061a48a8f |
| children | ffa3026d4196 |
comparison
equal
deleted
inserted
replaced
| 36267:08f061a48a8f | 36268:be5a6fe3643a |
|---|---|
| 283 br'\$(parent2|parent1?|child|plabel1|plabel2|clabel|root)\1') | 283 br'\$(parent2|parent1?|child|plabel1|plabel2|clabel|root)\1') |
| 284 if not do3way and not re.search(regex, cmdline): | 284 if not do3way and not re.search(regex, cmdline): |
| 285 cmdline += ' $parent1 $child' | 285 cmdline += ' $parent1 $child' |
| 286 cmdline = re.sub(regex, quote, cmdline) | 286 cmdline = re.sub(regex, quote, cmdline) |
| 287 | 287 |
| 288 ui.debug('running %r in %s\n' % (cmdline, tmproot)) | 288 ui.debug('running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot)) |
| 289 ui.system(cmdline, cwd=tmproot, blockedtag='extdiff') | 289 ui.system(cmdline, cwd=tmproot, blockedtag='extdiff') |
| 290 | 290 |
| 291 for copy_fn, working_fn, st in fnsandstat: | 291 for copy_fn, working_fn, st in fnsandstat: |
| 292 cpstat = os.lstat(copy_fn) | 292 cpstat = os.lstat(copy_fn) |
| 293 # Some tools copy the file and attributes, so mtime may not detect | 293 # Some tools copy the file and attributes, so mtime may not detect |