This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10581

revlog: use revlog.display_id in LookupError
ClosedPublic

Authored by marmoute on May 3 2021, 7:49 AM.

Details

Reviewers
indygreg
durin42
Alphare
Group Reviewers
hg-reviewers
Commits
rHG96ee8ca99f5a: revlog: use revlog.display_id in LookupError

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.May 3 2021, 7:49 AM
baymax updated this revision to Diff 27496.May 3 2021, 9:43 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.May 11 2021, 9:55 AM
This revision is now accepted and ready to land.May 11 2021, 9:55 AM
marmoute added a commit: rHG96ee8ca99f5a: revlog: use revlog.display_id in LookupError.May 11 2021, 12:56 PM
Closed by commit rHG96ee8ca99f5a: revlog: use revlog.display_id in LookupError (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 27827

mercurial/bundlerepo.py

if cs == node: if cs == node:
linkrev = nullrev linkrev = nullrev
else: else:
linkrev = linkmapper(cs) linkrev = linkmapper(cs)
for p in (p1, p2): for p in (p1, p2):
if not self.index.has_node(p): if not self.index.has_node(p):
raise error.LookupError( raise error.LookupError(
p, self._indexfile, _(b"unknown parent") p, self.display_id, _(b"unknown parent")
) )
if not self.index.has_node(deltabase): if not self.index.has_node(deltabase):
raise LookupError( raise LookupError(
deltabase, self._indexfile, _(b'unknown delta base') deltabase, self.display_id, _(b'unknown delta base')
) )
baserev = self.rev(deltabase) baserev = self.rev(deltabase)
# start, size, full unc. size, base (unused), link, p1, p2, node, sidedata_offset (unused), sidedata_size (unused) # start, size, full unc. size, base (unused), link, p1, p2, node, sidedata_offset (unused), sidedata_size (unused)
e = ( e = (
revlog.offset_type(start, flags), revlog.offset_type(start, flags),
size, size,
-1, -1,

mercurial/filelog.py

def rev(self, node): def rev(self, node):
return self._revlog.rev(node) return self._revlog.rev(node)
def node(self, rev): def node(self, rev):
return self._revlog.node(rev) return self._revlog.node(rev)
def lookup(self, node): def lookup(self, node):
return storageutil.fileidlookup( return storageutil.fileidlookup(
self._revlog, node, self._revlog._indexfile self._revlog, node, self._revlog.display_id
) )
def linkrev(self, rev): def linkrev(self, rev):
return self._revlog.linkrev(rev) return self._revlog.linkrev(rev)
def commonancestorsheads(self, node1, node2): def commonancestorsheads(self, node1, node2):
return self._revlog.commonancestorsheads(node1, node2) return self._revlog.commonancestorsheads(node1, node2)

mercurial/revlog.py

raise raise
except error.RevlogError: except error.RevlogError:
# parsers.c radix tree lookup failed # parsers.c radix tree lookup failed
if ( if (
node == self.nodeconstants.wdirid node == self.nodeconstants.wdirid
or node in self.nodeconstants.wdirfilenodeids or node in self.nodeconstants.wdirfilenodeids
): ):
raise error.WdirUnsupported raise error.WdirUnsupported
raise error.LookupError(node, self._indexfile, _(b'no node')) raise error.LookupError(node, self.display_id, _(b'no node'))
# Accessors for index entries. # Accessors for index entries.
# First tuple entry is 8 bytes. First 6 bytes are offset. Last 2 bytes # First tuple entry is 8 bytes. First 6 bytes are offset. Last 2 bytes
# are flags. # are flags.
def start(self, rev): def start(self, rev):
return int(self.index[rev][0] >> 16) return int(self.index[rev][0] >> 16)
""" """
n = self._match(id) n = self._match(id)
if n is not None: if n is not None:
return n return n
n = self._partialmatch(id) n = self._partialmatch(id)
if n: if n:
return n return n
raise error.LookupError(id, self._indexfile, _(b'no match found')) raise error.LookupError(id, self.display_id, _(b'no match found'))
def shortest(self, node, minlength=1): def shortest(self, node, minlength=1):
"""Find the shortest unambiguous prefix that matches node.""" """Find the shortest unambiguous prefix that matches node."""
def isvalid(prefix): def isvalid(prefix):
try: try:
matchednode = self._partialmatch(prefix) matchednode = self._partialmatch(prefix)
except error.AmbiguousPrefixLookupError: except error.AmbiguousPrefixLookupError:
return False return False
except error.WdirUnsupported: except error.WdirUnsupported:
# single 'ff...' match # single 'ff...' match
return True return True
if matchednode is None: if matchednode is None:
raise error.LookupError(node, self._indexfile, _(b'no node')) raise error.LookupError(node, self.display_id, _(b'no node'))
return True return True
def maybewdir(prefix): def maybewdir(prefix):
return all(c == b'f' for c in pycompat.iterbytestr(prefix)) return all(c == b'f' for c in pycompat.iterbytestr(prefix))
hexnode = hex(node) hexnode = hex(node)
def disambiguate(hexnode, minlength): def disambiguate(hexnode, minlength):
"""Disambiguate against wdirid.""" """Disambiguate against wdirid."""
for length in range(minlength, len(hexnode) + 1): for length in range(minlength, len(hexnode) + 1):
prefix = hexnode[:length] prefix = hexnode[:length]
if not maybewdir(prefix): if not maybewdir(prefix):
return prefix return prefix
if not getattr(self, 'filteredrevs', None): if not getattr(self, 'filteredrevs', None):
try: try:
length = max(self.index.shortest(node), minlength) length = max(self.index.shortest(node), minlength)
return disambiguate(hexnode, length) return disambiguate(hexnode, length)
except error.RevlogError: except error.RevlogError:
if node != self.nodeconstants.wdirid: if node != self.nodeconstants.wdirid:
raise error.LookupError( raise error.LookupError(
node, self._indexfile, _(b'no node') node, self.display_id, _(b'no node')
) )
except AttributeError: except AttributeError:
# Fall through to pure code # Fall through to pure code
pass pass
if node == self.nodeconstants.wdirid: if node == self.nodeconstants.wdirid:
for length in range(minlength, len(hexnode) + 1): for length in range(minlength, len(hexnode) + 1):
prefix = hexnode[:length] prefix = hexnode[:length]
if duplicaterevisioncb: if duplicaterevisioncb:
duplicaterevisioncb(self, rev) duplicaterevisioncb(self, rev)
empty = False empty = False
continue continue
for p in (p1, p2): for p in (p1, p2):
if not self.index.has_node(p): if not self.index.has_node(p):
raise error.LookupError( raise error.LookupError(
p, self._indexfile, _(b'unknown parent') p, self.radix, _(b'unknown parent')
) )
if not self.index.has_node(deltabase): if not self.index.has_node(deltabase):
raise error.LookupError( raise error.LookupError(
deltabase, self._indexfile, _(b'unknown delta base') deltabase, self.display_id, _(b'unknown delta base')
) )
baserev = self.rev(deltabase) baserev = self.rev(deltabase)
if baserev != nullrev and self.iscensored(baserev): if baserev != nullrev and self.iscensored(baserev):
# if base is censored, delta must be full replacement in a # if base is censored, delta must be full replacement in a
# single patch operation # single patch operation
hlen = struct.calcsize(b">lll") hlen = struct.calcsize(b">lll")

tests/test-bundle-r.t

revision 2 revision 2
$ hg tip -q $ hg tip -q
2:4ce51a113780 2:4ce51a113780
$ hg unbundle ../test-bundle-should-fail.hg $ hg unbundle ../test-bundle-should-fail.hg
adding changesets adding changesets
transaction abort! transaction abort!
rollback completed rollback completed
abort: 00changelog.i@93ee6ab32777cd430e07da694794fb6a4f917712: unknown parent abort: 00changelog@93ee6ab32777cd430e07da694794fb6a4f917712: unknown parent
[50] [50]
revision 2 revision 2
$ hg tip -q $ hg tip -q
2:4ce51a113780 2:4ce51a113780
$ hg unbundle ../test-bundle-all.hg $ hg unbundle ../test-bundle-all.hg
adding changesets adding changesets

tests/test-bundle.t

test for https://bz.mercurial-scm.org/1144 test for https://bz.mercurial-scm.org/1144
test that verify bundle does not traceback test that verify bundle does not traceback
partial history bundle, fails w/ unknown parent partial history bundle, fails w/ unknown parent
$ hg -R bundle.hg verify $ hg -R bundle.hg verify
abort: 00changelog.i@bbd179dfa0a71671c253b3ae0aa1513b60d199fa: unknown parent abort: 00changelog@bbd179dfa0a71671c253b3ae0aa1513b60d199fa: unknown parent
[50] [50]
full history bundle, refuses to verify non-local repo full history bundle, refuses to verify non-local repo
#if repobundlerepo #if repobundlerepo
$ hg -R all.hg verify $ hg -R all.hg verify
abort: cannot verify bundle or remote repos abort: cannot verify bundle or remote repos
[255] [255]

tests/test-convert-filemap.t

$ rm source/.hg/store/data/dir/file3.i $ rm source/.hg/store/data/dir/file3.i
$ rm source/.hg/store/data/dir/file4.i $ rm source/.hg/store/data/dir/file4.i
#endif #endif
#if reposimplestore #if reposimplestore
$ rm -rf source/.hg/store/data/dir/file3 $ rm -rf source/.hg/store/data/dir/file3
$ rm -rf source/.hg/store/data/dir/file4 $ rm -rf source/.hg/store/data/dir/file4
#endif #endif
$ hg -q convert --filemap renames.fmap --datesort source dummydest $ hg -q convert --filemap renames.fmap --datesort source dummydest
abort: data/dir/file3.i@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !) abort: data/dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !)
abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !) abort: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
[50] [50]
$ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo $ hg -q convert --filemap renames.fmap --datesort --config convert.hg.ignoreerrors=1 source renames.repo
ignoring: data/dir/file3.i@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !) ignoring: data/dir/file3@e96dce0bc6a217656a3a410e5e6bec2c4f42bf7c: no match found (reporevlogstore !)
ignoring: data/dir/file4.i@6edd55f559cdce67132b12ca09e09cee08b60442: no match found (reporevlogstore !) ignoring: data/dir/file4@6edd55f559cdce67132b12ca09e09cee08b60442: no match found (reporevlogstore !)
ignoring: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !) ignoring: data/dir/file3/index@e96dce0bc6a2: no node (reposimplestore !)
ignoring: data/dir/file4/index@6edd55f559cd: no node (reposimplestore !) ignoring: data/dir/file4/index@6edd55f559cd: no node (reposimplestore !)
$ hg up -q -R renames.repo $ hg up -q -R renames.repo
$ glog -R renames.repo $ glog -R renames.repo
@ 4 "8: change foo" files: foo2 @ 4 "8: change foo" files: foo2
| |
o 3 "6: change foo baz" files: foo2 o 3 "6: change foo baz" files: foo2
| |

tests/test-convert-hg-source.t

#endif #endif
$ cd .. $ cd ..
$ hg --config convert.hg.ignoreerrors=True convert broken fixed $ hg --config convert.hg.ignoreerrors=True convert broken fixed
initializing destination fixed repository initializing destination fixed repository
scanning source... scanning source...
sorting... sorting...
converting... converting...
4 init 4 init
ignoring: data/b.i@1e88685f5ddec574a34c70af492f95b6debc8741: no match found (reporevlogstore !) ignoring: data/b@1e88685f5ddec574a34c70af492f95b6debc8741: no match found (reporevlogstore !)
ignoring: data/b/index@1e88685f5dde: no node (reposimplestore !) ignoring: data/b/index@1e88685f5dde: no node (reposimplestore !)
3 changeall 3 changeall
2 changebagain 2 changebagain
1 merge 1 merge
0 moveb 0 moveb
$ hg -R fixed verify $ hg -R fixed verify
checking changesets checking changesets
checking manifests checking manifests

tests/test-narrow-exchange.t

$ hg push ssh://user@dummy/narrow $ hg push ssh://user@dummy/narrow
pushing to ssh://user@dummy/narrow pushing to ssh://user@dummy/narrow
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: transaction abort! remote: transaction abort!
remote: rollback completed remote: rollback completed
remote: abort: data/inside2/f.i@4a1aa07735e673e20c00fae80f40dc301ee30616: unknown parent (reporevlogstore !) remote: abort: data/inside2/f@4a1aa07735e673e20c00fae80f40dc301ee30616: unknown parent (reporevlogstore !)
remote: abort: data/inside2/f/index@4a1aa07735e6: no node (reposimplestore !) remote: abort: data/inside2/f/index@4a1aa07735e6: no node (reposimplestore !)
abort: stream ended unexpectedly (got 0 bytes, expected 4) abort: stream ended unexpectedly (got 0 bytes, expected 4)
[255] [255]
Can pull from wider repo if change affects only paths outside remote's Can pull from wider repo if change affects only paths outside remote's
narrow spec narrow spec
$ echo 4 > inside2/f $ echo 4 > inside2/f
$ hg ci -m 'inside2 4' $ hg ci -m 'inside2 4'
TODO: lfs shouldn't abort like this TODO: lfs shouldn't abort like this
$ hg push ssh://user@dummy/narrow2 || true $ hg push ssh://user@dummy/narrow2 || true
pushing to ssh://user@dummy/narrow2 pushing to ssh://user@dummy/narrow2
searching for changes searching for changes
remote: adding changesets remote: adding changesets
remote: adding manifests remote: adding manifests
remote: adding file changes remote: adding file changes
remote: added 1 changesets with 0 changes to 0 files (no-lfs-on !) remote: added 1 changesets with 0 changes to 0 files (no-lfs-on !)
remote: error: pretxnchangegroup.lfs hook raised an exception: data/inside2/f.i@f59b4e0218355383d2789196f1092abcf2262b0c: no match found (lfs-on !) remote: error: pretxnchangegroup.lfs hook raised an exception: data/inside2/f@f59b4e0218355383d2789196f1092abcf2262b0c: no match found (lfs-on !)
remote: transaction abort! (lfs-on !) remote: transaction abort! (lfs-on !)
remote: rollback completed (lfs-on !) remote: rollback completed (lfs-on !)
remote: abort: data/inside2/f.i@f59b4e0218355383d2789196f1092abcf2262b0c: no match found (lfs-on !) remote: abort: data/inside2/f@f59b4e0218355383d2789196f1092abcf2262b0c: no match found (lfs-on !)
abort: stream ended unexpectedly (got 0 bytes, expected 4) (lfs-on !) abort: stream ended unexpectedly (got 0 bytes, expected 4) (lfs-on !)

tests/test-pull-bundle.t

0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo.pullbundle3 $ cd repo.pullbundle3
$ hg pull -r 1 $ hg pull -r 1
pulling from http://localhost:$HGPORT2/ pulling from http://localhost:$HGPORT2/
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
abort: 00changelog.i@66f7d451a68b85ed82ff5fcc254daf50c74144bd: no node abort: 00changelog@66f7d451a68b85ed82ff5fcc254daf50c74144bd: no node
[50] [50]
$ cd .. $ cd ..
$ killdaemons.py $ killdaemons.py
$ grep 'sending pullbundle ' repo/.hg/blackbox.log $ grep 'sending pullbundle ' repo/.hg/blackbox.log
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
* sending pullbundle "0.hg" (glob) * sending pullbundle "0.hg" (glob)
$ rm repo/.hg/blackbox.log $ rm repo/.hg/blackbox.log