This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10271

tests: replace a use of rebaseskipobsolete=0 by `hg rebase --keep`
Needs RevisionPublic

Authored by martinvonz on Mar 25 2021, 7:35 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

I'm about to delete the experimental.rebaseskipobsolete config, so
this test case won't be able to exist in its current form. This patch
updates it to use --keep instead of `--config
experimental.rebaseskipobsolete=off` to allow it to rebase pruned
commits. I suspect some of the cases covered by the test will no
longer be tested now, but that doesn't matter if we make those cases
impossible by removing the config (some later patch).

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Mar 25 2021, 7:35 PM
baymax requested changes to this revision.Aug 18 2021, 9:39 AM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Aug 18 2021, 9:39 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-obsolete.t (13 lines)

Diff 26599

tests/test-rebase-obsolete.t

| o 6:eea13746799a G | o 6:eea13746799a G
|/| |/|
o | 5:24b6387c8c8c F o | 5:24b6387c8c8c F
| | | |
| o 4:9520eea781bc E | o 4:9520eea781bc E
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
$ hg rebase --source 'desc(B)' --dest 'tip' --config experimental.rebaseskipobsolete=True $ hg rebase --source 'desc(B)' --dest 'tip'
rebasing 8:8877864f1edb "B" rebasing 8:8877864f1edb "B"
note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 tip "D" note: not rebasing 9:08483444fef9 "D", already in destination as 11:4596109a6a43 tip "D"
rebasing 10:5ae4c968c6ac "C" rebasing 10:5ae4c968c6ac "C"
$ hg debugobsolete $ hg debugobsolete
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'} 32af7686d403cf45b5d95f2d70cebea587ac806a 0 {5fddd98957c8a54a4d436dfe1da9d87f21a1b97b} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
$ echo J > J $ echo J > J
$ hg add J $ hg add J
$ hg commit -m J $ hg commit -m J
1 new orphan changesets 1 new orphan changesets
$ hg debugobsolete `hg log --rev . -T '{node}'` $ hg debugobsolete `hg log --rev . -T '{node}'`
1 new obsolescence markers 1 new obsolescence markers
obsoleted 1 changesets obsoleted 1 changesets
$ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off $ hg rebase --rev .~1::. --dest 'max(desc(D))' --keep
rebasing 9:4bde274eefcf "I" rebasing 9:4bde274eefcf "I"
rebasing 13:06edfc82198f tip "J" rebasing 13:06edfc82198f tip "J"
2 new content-divergent changesets
$ hg log -G $ hg log -G
@ 15:5ae8a643467b J @ 15:5ae8a643467b J
| |
* 14:9ad579b4a5de I o 14:9ad579b4a5de I
| |
| * 12:acd174b7ab39 I | o 12:acd174b7ab39 I
| | | |
| o 11:6c11a6218c97 H | o 11:6c11a6218c97 H
| | | |
o | 10:b5313c85b22e D o | 10:b5313c85b22e D
|/ |/
| * 8:53a6a128b2b7 M | * 8:53a6a128b2b7 M
| |\ | |\
| | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
| * 17:97219452e4bd L | * 17:97219452e4bd L
| | | |
| x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b) | x 16:fc37a630c901 K (rewritten using amend as 18:bfaedf8eb73b)
|/ |/
| * 15:5ae8a643467b J | * 15:5ae8a643467b J
| | | |
| x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901) | x 14:9ad579b4a5de I (rewritten using amend as 16:fc37a630c901)
|/ |/
| * 12:acd174b7ab39 I | o 12:acd174b7ab39 I
| | | |
| o 11:6c11a6218c97 H | o 11:6c11a6218c97 H
| | | |
o | 10:b5313c85b22e D o | 10:b5313c85b22e D
|/ |/
| * 8:53a6a128b2b7 M | * 8:53a6a128b2b7 M
| |\ | |\
| | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97) | | x 7:02de42196ebe H (rewritten using rebase as 11:6c11a6218c97)
| | | | | |
o---+ 6:eea13746799a G o---+ 6:eea13746799a G
| | | | | |
| | o 5:24b6387c8c8c F | | o 5:24b6387c8c8c F
| | | | | |
o---+ 4:9520eea781bc E o---+ 4:9520eea781bc E
/ / / /
x | 3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e) x | 3:32af7686d403 D (rewritten using rebase as 10:b5313c85b22e)
| | | |
o | 2:5fddd98957c8 C o | 2:5fddd98957c8 C
| | | |
o | 1:42ccdea3bb16 B o | 1:42ccdea3bb16 B
|/ |/
o 0:cd010b8cd998 A o 0:cd010b8cd998 A
$ hg rebase -s 14 -d 17 --config experimental.rebaseskipobsolete=True $ hg rebase -s 14 -d 17
note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 "K" note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 "K"
rebasing 15:5ae8a643467b "J" rebasing 15:5ae8a643467b "J"
1 new orphan changesets 1 new orphan changesets
$ cd .. $ cd ..