equal
deleted
inserted
replaced
481 self.join("undo")) |
481 self.join("undo")) |
482 |
482 |
483 def recover(self): |
483 def recover(self): |
484 lock = self.lock() |
484 lock = self.lock() |
485 if os.path.exists(self.join("recover")): |
485 if os.path.exists(self.join("recover")): |
486 self.ui.status("attempting to rollback interrupted transaction\n") |
486 self.ui.status("rolling back interrupted transaction\n") |
487 return transaction.rollback(self.opener, self.join("recover")) |
487 return transaction.rollback(self.opener, self.join("recover")) |
488 else: |
488 else: |
489 self.ui.warn("no interrupted transaction available\n") |
489 self.ui.warn("no interrupted transaction available\n") |
490 |
490 |
491 def undo(self): |
491 def undo(self): |
492 lock = self.lock() |
492 lock = self.lock() |
493 if os.path.exists(self.join("undo")): |
493 if os.path.exists(self.join("undo")): |
494 self.ui.status("attempting to rollback last transaction\n") |
494 self.ui.status("rolling back last transaction\n") |
495 transaction.rollback(self.opener, self.join("undo")) |
495 transaction.rollback(self.opener, self.join("undo")) |
496 self.dirstate = None |
496 self.dirstate = None |
497 util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
497 util.rename(self.join("undo.dirstate"), self.join("dirstate")) |
498 self.dirstate = dirstate(self.opener, self.ui, self.root) |
498 self.dirstate = dirstate(self.opener, self.ui, self.root) |
499 else: |
499 else: |