Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 557:b9fee419a1bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
recover: the journal is named 'journal' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 recover: the journal is named 'journal' spotted by K Thananchayan <thananck@yahoo.com> manifest hash: a2ecfedb3d58011cdf5ef7741ff61aba15aa5885 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxXVbywK+sNU5EO8RAmiBAKCgULQVAZ42xuPRyzb3Rrk794LtaACgoLdF TNtgK/MqF6+EjWNJ5mm2geE= =m5U3 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 08:54:52 -0800
parents f6c6fa15ff70
children cdddf4652aec
comparison
equal deleted inserted replaced
556:f6c6fa15ff70 557:b9fee419a1bd
523 return transaction.transaction(self.opener, self.join("journal"), 523 return transaction.transaction(self.opener, self.join("journal"),
524 self.join("undo")) 524 self.join("undo"))
525 525
526 def recover(self): 526 def recover(self):
527 lock = self.lock() 527 lock = self.lock()
528 if os.path.exists(self.join("recover")): 528 if os.path.exists(self.join("journal")):
529 self.ui.status("rolling back interrupted transaction\n") 529 self.ui.status("rolling back interrupted transaction\n")
530 return transaction.rollback(self.opener, self.join("recover")) 530 return transaction.rollback(self.opener, self.join("journal"))
531 else: 531 else:
532 self.ui.warn("no interrupted transaction available\n") 532 self.ui.warn("no interrupted transaction available\n")
533 533
534 def undo(self): 534 def undo(self):
535 lock = self.lock() 535 lock = self.lock()