equal
deleted
inserted
replaced
1679 else: |
1679 else: |
1680 # launch the editor |
1680 # launch the editor |
1681 message = None |
1681 message = None |
1682 ui.debug(_('message:\n%s\n') % message) |
1682 ui.debug(_('message:\n%s\n') % message) |
1683 |
1683 |
1684 files = patch.patch(strip, tmpname, ui, cwd=repo.root) |
1684 files, fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root) |
1685 removes = [] |
1685 removes = [] |
1686 if len(files) > 0: |
1686 if len(files) > 0: |
1687 cfiles = files.keys() |
1687 cfiles = files.keys() |
1688 copies = [] |
1688 copies = [] |
1689 copts = {'after': False, 'force': False} |
1689 copts = {'after': False, 'force': False} |