mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +03:00
changectx: issue a FilteredRepoLookupError when applicable
We capture FilteredxxxError and issue a FilteredRepoLookupError instead with a sightly different messsge. The message will likely get more improvement in the future. error: filtered revision '4'
This commit is contained in:
parent
5cf4921b01
commit
7fc829de42
@ -400,6 +400,8 @@ class changectx(basectx):
|
||||
self._node = changeid
|
||||
self._rev = repo.changelog.rev(changeid)
|
||||
return
|
||||
except error.FilteredRepoLookupError:
|
||||
raise
|
||||
except LookupError:
|
||||
pass
|
||||
|
||||
@ -415,6 +417,8 @@ class changectx(basectx):
|
||||
self._rev = r
|
||||
self._node = repo.changelog.node(r)
|
||||
return
|
||||
except error.FilteredIndexError:
|
||||
raise
|
||||
except (ValueError, OverflowError, IndexError):
|
||||
pass
|
||||
|
||||
@ -423,6 +427,8 @@ class changectx(basectx):
|
||||
self._node = bin(changeid)
|
||||
self._rev = repo.changelog.rev(self._node)
|
||||
return
|
||||
except error.FilteredLookupError:
|
||||
raise
|
||||
except (TypeError, LookupError):
|
||||
pass
|
||||
|
||||
@ -438,10 +444,12 @@ class changectx(basectx):
|
||||
self._node = repo.branchtip(changeid)
|
||||
self._rev = repo.changelog.rev(self._node)
|
||||
return
|
||||
except error.FilteredRepoLookupError:
|
||||
raise
|
||||
except error.RepoLookupError:
|
||||
pass
|
||||
|
||||
self._node = repo.changelog._partialmatch(changeid)
|
||||
self._node = repo.unfiltered().changelog._partialmatch(changeid)
|
||||
if self._node is not None:
|
||||
self._rev = repo.changelog.rev(self._node)
|
||||
return
|
||||
@ -459,6 +467,10 @@ class changectx(basectx):
|
||||
changeid = hex(changeid)
|
||||
except TypeError:
|
||||
pass
|
||||
except (error.FilteredIndexError, error.FilteredLookupError,
|
||||
error.FilteredRepoLookupError):
|
||||
raise error.FilteredRepoLookupError(_("filtered revision '%s'")
|
||||
% changeid)
|
||||
except IndexError:
|
||||
pass
|
||||
raise error.RepoLookupError(
|
||||
|
@ -2175,7 +2175,7 @@ proper status for filtered revision
|
||||
Content-Type: text/plain; charset=ascii\r (esc)
|
||||
\r (esc)
|
||||
|
||||
error: unknown revision '5'
|
||||
error: filtered revision '5'
|
||||
|
||||
|
||||
|
||||
@ -2189,7 +2189,7 @@ proper status for filtered revision
|
||||
Content-Type: text/plain; charset=ascii\r (esc)
|
||||
\r (esc)
|
||||
|
||||
error: unknown revision '4'
|
||||
error: filtered revision '4'
|
||||
|
||||
filtered '0' changeset
|
||||
|
||||
|
@ -1393,7 +1393,7 @@ enable obsolete to test hidden feature
|
||||
1:a765632148dc55d38c35c4f247c618701886cb2f
|
||||
0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
|
||||
$ hg log -r a
|
||||
abort: unknown revision 'a'!
|
||||
abort: filtered revision 'a'!
|
||||
[255]
|
||||
|
||||
test that parent prevent a changeset to be hidden
|
||||
|
@ -182,7 +182,7 @@ check that various commands work well with filtering
|
||||
abort: unknown revision '6'!
|
||||
[255]
|
||||
$ hg log -r 4
|
||||
abort: unknown revision '4'!
|
||||
abort: filtered revision '4'!
|
||||
[255]
|
||||
|
||||
Check that public changeset are not accounted as obsolete:
|
||||
|
Loading…
Reference in New Issue
Block a user