This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9379

errors: consistently don't use trailing "!" in "not found in manifest" message
ClosedPublic

Authored by martinvonz on Nov 23 2020, 6:30 PM.

Details

Reviewers
Alphare
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG50afeeeb7b79: errors: consistently don't use trailing "!" in "not found in manifest" message
Summary

We already had some places with the same message without the trailing
"!".

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.

Revision Contents
Changeset List

Diff 23661

mercurial/commands.py

for cp in ctx.parents(): for cp in ctx.parents():
if not cp: if not cp:
continue continue
try: try:
filenodes.append(cp.filenode(file_)) filenodes.append(cp.filenode(file_))
except error.LookupError: except error.LookupError:
pass pass
if not filenodes: if not filenodes:
raise error.InputError(_(b"'%s' not found in manifest!") % file_) raise error.InputError(_(b"'%s' not found in manifest") % file_)
p = [] p = []
for fn in filenodes: for fn in filenodes:
fctx = repo.filectx(file_, fileid=fn) fctx = repo.filectx(file_, fileid=fn)
p.append(fctx.node()) p.append(fctx.node())
else: else:
p = [cp.node() for cp in ctx.parents()] p = [cp.node() for cp in ctx.parents()]
displayer = logcmdutil.changesetdisplayer(ui, repo, opts) displayer = logcmdutil.changesetdisplayer(ui, repo, opts)

tests/test-parents.t

$ hg parents c $ hg parents c
changeset: 3:02d851b7e549 changeset: 3:02d851b7e549
user: test user: test
date: Thu Jan 01 00:00:03 1970 +0000 date: Thu Jan 01 00:00:03 1970 +0000
summary: c summary: c
$ hg parents -r 3 c $ hg parents -r 3 c
abort: 'c' not found in manifest! abort: 'c' not found in manifest
[10] [10]
$ hg parents -r 2 $ hg parents -r 2
changeset: 1:d786049f033a changeset: 1:d786049f033a
user: test user: test
date: Thu Jan 01 00:00:01 1970 +0000 date: Thu Jan 01 00:00:01 1970 +0000
summary: a summary: a

tests/test-remotefilelog-prefetch.t

abort: no files to copy abort: no files to copy
[10] [10]
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
.. The following output line about files fetches is globed because it is .. The following output line about files fetches is globed because it is
.. flaky, the core the test is checked when checking the cache dir, so .. flaky, the core the test is checked when checking the cache dir, so
.. hopefully this flakyness is not hiding any actual bug. .. hopefully this flakyness is not hiding any actual bug.
$ hg revert -a -r 1 || true $ hg revert -a -r 1 || true
? files fetched over 1 fetches - (? misses, 0.00% hit ratio) over * (glob) ? files fetched over 1 fetches - (? misses, 0.00% hit ratio) over * (glob)
abort: z2@109c3a557a73: not found in manifest! (?) abort: z2@109c3a557a73: not found in manifest (?)
$ find $CACHEDIR -type f | sort $ find $CACHEDIR -type f | sort
$TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0 $TESTTMP/hgcache/master/11/f6ad8ec52a2984abaafd7c3b516503785c2072/ef95c5376f34698742fe34f315fd82136f8f68c0
$TESTTMP/hgcache/master/39/5df8f7c51f007019cb30201c49e884b46b92fa/69a1b67522704ec122181c0890bd16e9d3e7516a $TESTTMP/hgcache/master/39/5df8f7c51f007019cb30201c49e884b46b92fa/69a1b67522704ec122181c0890bd16e9d3e7516a
$TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca $TESTTMP/hgcache/master/95/cb0bfd2977c761298d9624e4b4d4c72a39974a/076f5e2225b3ff0400b98c92aa6cdf403ee24cca
$TESTTMP/hgcache/repos $TESTTMP/hgcache/repos
# warning when we have excess remotefilelog fetching # warning when we have excess remotefilelog fetching