Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 9691:f8e1456e1c2c
change 'journal already exists' to 'abandoned transaction found'
Journal already exists is a pretty internal piece of information, which
doesn't necessarily mean much to people who are not familiar with the code.
The new text is a more well-known concept.
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Mon, 02 Nov 2009 10:17:20 +0100 |
| parents | ee913987e4b0 |
| children | 0b999aec64e8 |
comparison
equal
deleted
inserted
replaced
| 9690:b33d70849a20 | 9691:f8e1456e1c2c |
|---|---|
| 554 if tr and tr.running(): | 554 if tr and tr.running(): |
| 555 return tr.nest() | 555 return tr.nest() |
| 556 | 556 |
| 557 # abort here if the journal already exists | 557 # abort here if the journal already exists |
| 558 if os.path.exists(self.sjoin("journal")): | 558 if os.path.exists(self.sjoin("journal")): |
| 559 raise error.RepoError(_("journal already exists - run hg recover")) | 559 raise error.RepoError(_("abandoned transaction found - run hg recover")) |
| 560 | 560 |
| 561 # save dirstate for rollback | 561 # save dirstate for rollback |
| 562 try: | 562 try: |
| 563 ds = self.opener("dirstate").read() | 563 ds = self.opener("dirstate").read() |
| 564 except IOError: | 564 except IOError: |