equal
deleted
inserted
replaced
624 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts)) |
624 return commitfunc(ui, repo, *newfiles, **pycompat.strkwargs(opts)) |
625 finally: |
625 finally: |
626 # 5. finally restore backed-up files |
626 # 5. finally restore backed-up files |
627 try: |
627 try: |
628 dirstate = repo.dirstate |
628 dirstate = repo.dirstate |
629 for realname, tmpname in pycompat.iteritems(backups): |
629 for realname, tmpname in backups.items(): |
630 ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) |
630 ui.debug(b'restoring %r to %r\n' % (tmpname, realname)) |
631 |
631 |
632 if dirstate.get_entry(realname).maybe_clean: |
632 if dirstate.get_entry(realname).maybe_clean: |
633 # without normallookup, restoring timestamp |
633 # without normallookup, restoring timestamp |
634 # may cause partially committed files |
634 # may cause partially committed files |