Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 4438:3900f684a150

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix hg import --exact bug that hangs hg on failure.
author Eric Hopper <hopper@omnifarious.org>
date Thu, 17 May 2007 09:29:30 -0700
parents 0912d8df5e19
children e8a584067825
comparison
equal deleted inserted replaced
4437:a210b40d0860 4438:3900f684a150
584 return True 584 return True
585 else: 585 else:
586 self.ui.warn(_("no interrupted transaction available\n")) 586 self.ui.warn(_("no interrupted transaction available\n"))
587 return False 587 return False
588 588
589 def rollback(self, wlock=None): 589 def rollback(self, wlock=None, lock=None):
590 if not wlock: 590 if not wlock:
591 wlock = self.wlock() 591 wlock = self.wlock()
592 l = self.lock() 592 if not lock:
593 lock = self.lock()
593 if os.path.exists(self.sjoin("undo")): 594 if os.path.exists(self.sjoin("undo")):
594 self.ui.status(_("rolling back last transaction\n")) 595 self.ui.status(_("rolling back last transaction\n"))
595 transaction.rollback(self.sopener, self.sjoin("undo")) 596 transaction.rollback(self.sopener, self.sjoin("undo"))
596 util.rename(self.join("undo.dirstate"), self.join("dirstate")) 597 util.rename(self.join("undo.dirstate"), self.join("dirstate"))
597 self.reload() 598 self.reload()