This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12552

rebase: while rewriting desc hashes, ignore ambiguous prefix "hashes"
ClosedPublic

Authored by spectral on Wed, Apr 13, 4:42 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG532b649c1deb: rebase: while rewriting desc hashes, ignore ambiguous prefix "hashes"
Summary

If a repo is sufficiently large, a six digit number "hash prefix" can somewhat
easily reference an ambiguous hash prefix.

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

spectral created this revision.Wed, Apr 13, 4:42 PM
spectral updated this revision to Diff 33167.Wed, Apr 13, 4:47 PM
Alphare accepted this revision.Thu, Apr 14, 5:16 AM
Alphare added a subscriber: Alphare.

TIL about this feature

This revision is now accepted and ready to land.Thu, Apr 14, 5:16 AM

Revision Contents
Changeset List

Diff 33174

mercurial/rewriteutil.py

if not pending: if not pending:
pending = {} pending = {}
cache = {} cache = {}
hashes = re.findall(NODE_RE, commitmsg) hashes = re.findall(NODE_RE, commitmsg)
unfi = repo.unfiltered() unfi = repo.unfiltered()
for h in hashes: for h in hashes:
try: try:
fullnode = scmutil.resolvehexnodeidprefix(unfi, h) fullnode = scmutil.resolvehexnodeidprefix(unfi, h)
except error.WdirUnsupported: except (error.WdirUnsupported, error.AmbiguousPrefixLookupError):
# Someone has an fffff... in a commit message we're # Someone has an fffff... or some other prefix that's ambiguous in a
# rewriting. Don't try rewriting that. # commit message we're rewriting. Don't try rewriting that.
continue continue
if fullnode is None: if fullnode is None:
continue continue
ctx = unfi[fullnode] ctx = unfi[fullnode]
if not ctx.obsolete(): if not ctx.obsolete():
successors = pending.get(fullnode) successors = pending.get(fullnode)
if successors is None: if successors is None:
continue continue

tests/test-rebase-inmemory.t

$ hg co -q 000000000 $ hg co -q 000000000
$ echo test9912 > test $ echo test9912 > test
$ hg ci -qAm 'test9912' $ hg ci -qAm 'test9912'
$ hg co -q 4 $ hg co -q 4
$ echo contents > some_file $ echo contents > some_file
$ hg ci -qAm 'The previous two (parentless) commits had a hash prefix of b04363. Check that rewrite_hash_refs will not fail because of that.' $ hg ci -qAm 'The previous two (parentless) commits had a hash prefix of b04363. Check that rewrite_hash_refs will not fail because of that.'
$ hg rebase -r . -d 5 $ hg rebase -r . -d 5
rebasing 8:5c4cdabf5769 tip "The previous two (parentless) commits had a hash prefix of b04363. Check that rewrite_hash_refs will not fail because of that." rebasing 8:5c4cdabf5769 tip "The previous two (parentless) commits had a hash prefix of b04363. Check that rewrite_hash_refs will not fail because of that."
abort: 00changelog@b04363: ambiguous identifier (known-bad-output !) saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/5c4cdabf5769-335e1828-rebase.hg
[50]
$ cd .. $ cd ..
Test (virtual) working directory without changes, created by merge conflict Test (virtual) working directory without changes, created by merge conflict
resolution. There was a regression where the file was incorrectly detected as resolution. There was a regression where the file was incorrectly detected as
changed although the file contents were the same as in the parent. changed although the file contents were the same as in the parent.
$ hg init nofilechanges $ hg init nofilechanges