equal
deleted
inserted
replaced
1563 finally: |
1563 finally: |
1564 files = patch.updatedir(ui, repo, files, wlock=wlock) |
1564 files = patch.updatedir(ui, repo, files, wlock=wlock) |
1565 n = repo.commit(files, message, user, date, wlock=wlock, lock=lock) |
1565 n = repo.commit(files, message, user, date, wlock=wlock, lock=lock) |
1566 if opts.get('exact'): |
1566 if opts.get('exact'): |
1567 if hex(n) != nodeid: |
1567 if hex(n) != nodeid: |
1568 repo.rollback() |
1568 repo.rollback(wlock=wlock, lock=lock) |
1569 raise util.Abort(_('patch is damaged or loses information')) |
1569 raise util.Abort(_('patch is damaged or loses information')) |
1570 finally: |
1570 finally: |
1571 os.unlink(tmpname) |
1571 os.unlink(tmpname) |
1572 |
1572 |
1573 def incoming(ui, repo, source="default", **opts): |
1573 def incoming(ui, repo, source="default", **opts): |