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.

5864:88783c8b5660

        return self._filter("decode", filename, data)

    def transaction(self):
        if self._transref and self._transref():
            return self._transref().nest()

        # save dirstate for rollback
        try:
            ds = self.opener("dirstate").read()
        except IOError:

5865:e7127f669edb

        return self._filter("decode", filename, data)

    def transaction(self):
        if self._transref and self._transref():
            return self._transref().nest()

        # abort here if the journal already exists
        if os.path.exists(self.sjoin("journal")):
            raise repo.RepoError(_("journal already exists - run hg recover"))

        # save dirstate for rollback
        try:
            ds = self.opener("dirstate").read()
        except IOError: