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-----
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -525,9 +525,9 @@ class localrepository:
def recover(self):
lock = self.lock()
- if os.path.exists(self.join("recover")):
+ if os.path.exists(self.join("journal")):
self.ui.status("rolling back interrupted transaction\n")
- return transaction.rollback(self.opener, self.join("recover"))
+ return transaction.rollback(self.opener, self.join("journal"))
else:
self.ui.warn("no interrupted transaction available\n")