Mercurial > hg
changeset 23012:bdb3349cf7ab
changectx: wrap the `changeid` processing in a try/except
We are going to introduce more precise exception classes for filtered nodes. So
we will have to upgrade them to the `RepoLookupError` level here. We wrap the
whole thing into a try/except to ease this future catching. Some of the current
exception catching will be moved in this one. But the current changeset focuses
on code movement only.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 15 Oct 2014 16:05:24 -0700 |
| parents | 006a81d07e57 |
| children | b50ed6b9b513 |
| files | mercurial/context.py |
| diffstat | 1 files changed, 79 insertions(+), 76 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Wed Oct 15 03:27:25 2014 -0700 +++ b/mercurial/context.py Wed Oct 15 16:05:24 2014 -0700 @@ -376,92 +376,95 @@ changeid = '.' self._repo = repo - if isinstance(changeid, int): + try: + if isinstance(changeid, int): + try: + self._node = repo.changelog.node(changeid) + except IndexError: + raise error.RepoLookupError( + _("unknown revision '%s'") % changeid) + self._rev = changeid + return + if isinstance(changeid, long): + changeid = str(changeid) + if changeid == '.': + self._node = repo.dirstate.p1() + self._rev = repo.changelog.rev(self._node) + return + if changeid == 'null': + self._node = nullid + self._rev = nullrev + return + if changeid == 'tip': + self._node = repo.changelog.tip() + self._rev = repo.changelog.rev(self._node) + return + if len(changeid) == 20: + try: + self._node = changeid + self._rev = repo.changelog.rev(changeid) + return + except LookupError: + pass + try: - self._node = repo.changelog.node(changeid) - except IndexError: - raise error.RepoLookupError( - _("unknown revision '%s'") % changeid) - self._rev = changeid - return - if isinstance(changeid, long): - changeid = str(changeid) - if changeid == '.': - self._node = repo.dirstate.p1() - self._rev = repo.changelog.rev(self._node) - return - if changeid == 'null': - self._node = nullid - self._rev = nullrev - return - if changeid == 'tip': - self._node = repo.changelog.tip() - self._rev = repo.changelog.rev(self._node) - return - if len(changeid) == 20: - try: - self._node = changeid - self._rev = repo.changelog.rev(changeid) + r = int(changeid) + if str(r) != changeid: + raise ValueError + l = len(repo.changelog) + if r < 0: + r += l + if r < 0 or r >= l: + raise ValueError + self._rev = r + self._node = repo.changelog.node(r) return - except LookupError: + except (ValueError, OverflowError, IndexError): pass - try: - r = int(changeid) - if str(r) != changeid: - raise ValueError - l = len(repo.changelog) - if r < 0: - r += l - if r < 0 or r >= l: - raise ValueError - self._rev = r - self._node = repo.changelog.node(r) - return - except (ValueError, OverflowError, IndexError): - pass + if len(changeid) == 40: + try: + self._node = bin(changeid) + self._rev = repo.changelog.rev(self._node) + return + except (TypeError, LookupError): + pass - if len(changeid) == 40: - try: - self._node = bin(changeid) + if changeid in repo._bookmarks: + self._node = repo._bookmarks[changeid] self._rev = repo.changelog.rev(self._node) return - except (TypeError, LookupError): + if changeid in repo._tagscache.tags: + self._node = repo._tagscache.tags[changeid] + self._rev = repo.changelog.rev(self._node) + return + try: + self._node = repo.branchtip(changeid) + self._rev = repo.changelog.rev(self._node) + return + except error.RepoLookupError: pass - if changeid in repo._bookmarks: - self._node = repo._bookmarks[changeid] - self._rev = repo.changelog.rev(self._node) - return - if changeid in repo._tagscache.tags: - self._node = repo._tagscache.tags[changeid] - self._rev = repo.changelog.rev(self._node) - return - try: - self._node = repo.branchtip(changeid) - self._rev = repo.changelog.rev(self._node) - return - except error.RepoLookupError: - pass + self._node = repo.changelog._partialmatch(changeid) + if self._node is not None: + self._rev = repo.changelog.rev(self._node) + return - self._node = repo.changelog._partialmatch(changeid) - if self._node is not None: - self._rev = repo.changelog.rev(self._node) - return - - # lookup failed - # check if it might have come from damaged dirstate - # - # XXX we could avoid the unfiltered if we had a recognizable exception - # for filtered changeset access - if changeid in repo.unfiltered().dirstate.parents(): - raise error.Abort(_("working directory has unknown parent '%s'!") - % short(changeid)) - try: - if len(changeid) == 20: - changeid = hex(changeid) - except TypeError: - pass + # lookup failed + # check if it might have come from damaged dirstate + # + # XXX we could avoid the unfiltered if we had a recognizable + # exception for filtered changeset access + if changeid in repo.unfiltered().dirstate.parents(): + msg = _("working directory has unknown parent '%s'!") + raise error.Abort(msg % short(changeid)) + try: + if len(changeid) == 20: + changeid = hex(changeid) + except TypeError: + pass + except Exception: + raise raise error.RepoLookupError( _("unknown revision '%s'") % changeid)