This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12551

tests: add test demonstrating issue with ambiguous has prefixes during rebase
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG80579e597439: tests: add test demonstrating issue with ambiguous has prefixes during rebase

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 33166.Wed, Apr 13, 4:47 PM
Alphare accepted this revision.Thu, Apr 14, 5:11 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
tests/test-rebase-inmemory.t
1013

I was about to say that this seemed very expensive to have in the test and that using chg is not always possible... then I saw it's a comment. heh

Thanks for documenting that

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

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-inmemory.t (27 lines)

Diff 33173

tests/test-rebase-inmemory.t

|\ |\
| o 2: 531f80391e4a 'c' | o 2: 531f80391e4a 'c'
| | | |
o | 1: 6f252845ea45 'a' o | 1: 6f252845ea45 'a'
|/ |/
o 0: d20a80d4def3 'base' o 0: d20a80d4def3 'base'
Add an explicit test for rewrite_hash_refs when the detected prefix is
ambiguous. Here's the super low-tech way I found this collision, if the hashing
scheme ever changes:
# hg init
# echo test0 > test
# hg ci -qAm 'test0' -u 'test' -d '0 0'
# i=1
# while [[ $(chg log -r . -T'{shortest(node, 6)}' | wc -c) -eq 6 ]]; do
AlphareUnsubmitted
Not Done

I was about to say that this seemed very expensive to have in the test and that using chg is not always possible... then I saw it's a comment. heh

Thanks for documenting that

Alphare: I was about to say that this seemed very expensive to have in the test and that using `chg` is…
# chg co -r 0000000000
# echo "test$i" > test
# chg ci -qAm "test$i" -u test -d '0 0'
# (( ++i ))
# done
$ hg co -q 0000000000
$ echo test5281 > test
$ hg ci -qAm 'test5281'
$ hg co -q 000000000
$ echo test9912 > test
$ hg ci -qAm 'test9912'
$ hg co -q 4
$ 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 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."
abort: 00changelog@b04363: ambiguous identifier (known-bad-output !)
[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
$ cd nofilechanges $ cd nofilechanges