equal
deleted
inserted
replaced
1654 else: |
1654 else: |
1655 # launch the editor |
1655 # launch the editor |
1656 message = None |
1656 message = None |
1657 ui.debug(_('message:\n%s\n') % message) |
1657 ui.debug(_('message:\n%s\n') % message) |
1658 |
1658 |
1659 files, fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root) |
1659 files = {} |
1660 files = patch.updatedir(ui, repo, files, wlock=wlock) |
1660 try: |
|
1661 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |
|
1662 files=files) |
|
1663 finally: |
|
1664 files = patch.updatedir(ui, repo, files, wlock=wlock) |
1661 repo.commit(files, message, user, date, wlock=wlock, lock=lock) |
1665 repo.commit(files, message, user, date, wlock=wlock, lock=lock) |
1662 finally: |
1666 finally: |
1663 os.unlink(tmpname) |
1667 os.unlink(tmpname) |
1664 |
1668 |
1665 def incoming(ui, repo, source="default", **opts): |
1669 def incoming(ui, repo, source="default", **opts): |