Mercurial > public > mercurial-scm > hg
comparison mercurial/localrepo.py @ 5865:e7127f669edb
transactions: don't show a backtrace when journal exists
Now we simply print a message on how to recover.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 16 Jan 2008 11:32:25 -0600 |
| parents | dd5a501cb97f |
| children | afb7bdf11a61 |
comparison
equal
deleted
inserted
replaced
| 5864:88783c8b5660 | 5865:e7127f669edb |
|---|---|
| 516 return self._filter("decode", filename, data) | 516 return self._filter("decode", filename, data) |
| 517 | 517 |
| 518 def transaction(self): | 518 def transaction(self): |
| 519 if self._transref and self._transref(): | 519 if self._transref and self._transref(): |
| 520 return self._transref().nest() | 520 return self._transref().nest() |
| 521 | |
| 522 # abort here if the journal already exists | |
| 523 if os.path.exists(self.sjoin("journal")): | |
| 524 raise repo.RepoError(_("journal already exists - run hg recover")) | |
| 521 | 525 |
| 522 # save dirstate for rollback | 526 # save dirstate for rollback |
| 523 try: | 527 try: |
| 524 ds = self.opener("dirstate").read() | 528 ds = self.opener("dirstate").read() |
| 525 except IOError: | 529 except IOError: |