This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11231

tests: add explicit coverage for update_hash_refs from rewriteutil
ClosedPublic

Authored by durin42 on Jul 29 2021, 4:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG324c8a299324: tests: add explicit coverage for update_hash_refs from rewriteutil
Summary

I couldn't find any evidence this is covered by tests in core (but there's a
good chance I missed it). We've seen a cute bug in that code, but first
let's just cover the cases that work correctly.

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

durin42 created this revision.Jul 29 2021, 4:39 PM
mharbison72 added a subscriber: mharbison72.Jul 29 2021, 11:07 PM

I couldn't find any evidence this is covered by tests in core

I think the only coverage might be in 1a5d3e555c70, but clearly that's not thorough enough.

durin42 added a commit: rHG324c8a299324: tests: add explicit coverage for update_hash_refs from rewriteutil.Jul 30 2021, 2:11 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG324c8a299324: tests: add explicit coverage for update_hash_refs from rewriteutil (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 29764

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'
Test that update_hash_refs works.
$ hg co 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo update_hash_refs > update_hash_refs
$ hg add update_hash_refs
$ hg ci -m 'this will change hash'
created new head
$ echo changed >> update_hash_refs
$ hg ci -m "this starts as the child of `hg log -r . -T'{node|short}'` but not 506e2454484b"
$ hg tglog
@ 5: becd28036887 'this starts as the child of 98789aa60148 but not 506e2454484b'
|
o 4: 98789aa60148 'this will change hash'
|
| o 3: 506e2454484b 'merge'
| |\
+---o 2: 531f80391e4a 'c'
| |
| o 1: 6f252845ea45 'a'
|/
o 0: d20a80d4def3 'base'
$ hg rebase -r '.^::' -d 3
rebasing 4:98789aa60148 "this will change hash"
rebasing 5:becd28036887 tip "this starts as the child of 98789aa60148 but not 506e2454484b"
saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/98789aa60148-72ec40bd-rebase.hg
$ hg tglog
@ 5: a445b8426f4b 'this starts as the child of c16c25696fe7 but not 506e2454484b'
|
o 4: c16c25696fe7 'this will change hash'
|
o 3: 506e2454484b 'merge'
|\
| o 2: 531f80391e4a 'c'
| |
o | 1: 6f252845ea45 'a'
|/
o 0: d20a80d4def3 'base'
$ 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