This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9225

tests: add test showing how `hg fix -s` deals with obsolete and orphan nodes
ClosedPublic

Authored by martinvonz on Oct 16 2020, 7:04 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG15a98880cc07: tests: add test showing how `hg fix -s` deals with obsolete and orphan nodes
rHGe281a1ac12a5: tests: add test showing how `hg fix -s` deals with obsolete and orphan nodes
Summary

We didn't have any tests for how hg fix -s behaves with obsolete
commits among the descendants. The next patch will change the behavior
in this area.

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

PathPackages
Mtests/test-fix-topology.t (35 lines)

Diff 23385

tests/test-fix-topology.t

Tests for the fix extension's behavior around non-trivial history topologies. Tests for the fix extension's behavior around non-trivial history topologies.
Looks for correct incremental fixing and reproduction of parent/child Looks for correct incremental fixing and reproduction of parent/child
relationships. We indicate fixed file content by uppercasing it. relationships. We indicate fixed file content by uppercasing it.
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> fix = > fix =
> strip = > strip =
> debugdrawdag=$TESTDIR/drawdag.py
> [fix] > [fix]
> uppercase-whole-file:command="$PYTHON" $UPPERCASEPY > uppercase-whole-file:command="$PYTHON" $UPPERCASEPY
> uppercase-whole-file:pattern=set:** > uppercase-whole-file:pattern=set:**
> EOF > EOF
This tests the only behavior that should really be affected by obsolescence, so This tests the only behavior that should really be affected by obsolescence, so
we'll test it with evolution off and on. This only changes the revision we'll test it with evolution off and on. This only changes the revision
numbers, if all is well. numbers, if all is well.
bbbb bbbb
CCCC CCCC
$ cat * $ cat *
aaaa aaaa
DDDD DDDD
XXXX XXXX
$ cd .. $ cd ..
$ hg init exclude-obsolete
$ cd exclude-obsolete
$ hg debugdrawdag <<'EOS'
> E C # prune: C
> | |
> D B # prune: B, D
> |/
> A
> EOS
1 new orphan changesets
$ hg log --graph --template '{rev} {desc}\n'
* 4 E
|
| x 3 C
| |
x | 2 D
| |
| x 1 B
|/
o 0 A
$ hg fix -s A
abort: fixing obsolete revision could cause divergence
[255]
$ hg fix -s B
abort: fixing obsolete revision could cause divergence
[255]
$ hg fix -s D
abort: fixing obsolete revision could cause divergence
[255]
$ hg fix -s E
$ cd ..
#endif #endif
The --all flag should fix anything that wouldn't cause a problem if you fixed The --all flag should fix anything that wouldn't cause a problem if you fixed
it, including the working copy. Obsolete revisions are not fixed because that it, including the working copy. Obsolete revisions are not fixed because that
could cause divergence. Public revisions would cause an abort because they are could cause divergence. Public revisions would cause an abort because they are
immutable. We can fix orphans because their successors are still just orphans immutable. We can fix orphans because their successors are still just orphans
of the original obsolete parent. When obsolesence is off, we're just fixing and of the original obsolete parent. When obsolesence is off, we're just fixing and
replacing anything that isn't public. replacing anything that isn't public.