equal
deleted
inserted
replaced
361 return 0 |
361 return 0 |
362 finally: |
362 finally: |
363 try: |
363 try: |
364 for realname, tmpname in backups.iteritems(): |
364 for realname, tmpname in backups.iteritems(): |
365 ui.debug('restoring %r to %r\n' % (tmpname, realname)) |
365 ui.debug('restoring %r to %r\n' % (tmpname, realname)) |
366 util.copyfile(tmpname, realname) |
366 util.copyfile(tmpname, repo.wjoin(realname)) |
367 os.unlink(tmpname) |
367 os.unlink(tmpname) |
368 os.rmdir(backupdir) |
368 os.rmdir(backupdir) |
369 except OSError: |
369 except OSError: |
370 pass |
370 pass |
371 return cmdutil.commit(ui, repo, recordfunc, pats, opts) |
371 return cmdutil.commit(ui, repo, recordfunc, pats, opts) |