Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/hg.py @ 501:7ea1c88792bf
Better messages for rollback and undo
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Better messages for rollback and undo
manifest hash: 22eeb8848b0e07e1f23a896b03c37f7d6f4bd82d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwSBtywK+sNU5EO8RAhNEAJ9MGJxgZjIKegh1TA7++wGbAzkovACgqL3I
k1ii4X5PEWEDcoyOp0VqJn4=
=wzlT
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 28 Jun 2005 02:03:25 -0800 |
parents | 81c563a254be |
children | a350c1cd3fc5 |
comparison
equal
deleted
inserted
replaced
500:ebc4714a7632 | 501:7ea1c88792bf |
---|---|
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: |