This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10270

tests: avoid using rebaseskipobsolete=0
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6b42343f3cb6: tests: avoid using rebaseskipobsolete=0
Summary

I'm about to delete the rebaseskipobsolete config. This patch
updates a test to get hidden commits into the rebase state by using
hg debugobsolete instead of setting rebaseskipobsolete=0.

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

martinvonz created this revision.Mar 25 2021, 7:35 PM
pulkit accepted this revision.Apr 8 2021, 12:57 PM
This revision is now accepted and ready to land.Apr 8 2021, 12:57 PM
martinvonz added a commit: rHG6b42343f3cb6: tests: avoid using rebaseskipobsolete=0.Apr 8 2021, 2:16 PM
Closed by commit rHG6b42343f3cb6: tests: avoid using rebaseskipobsolete=0 (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-obsolete4.t (34 lines)

Diff 26713

tests/test-rebase-obsolete4.t

> strip= > strip=
> EOF > EOF
Test that bookmark is moved and working dir is updated when all changesets have Test that bookmark is moved and working dir is updated when all changesets have
equivalents in destination equivalents in destination
$ hg init rbsrepo && cd rbsrepo $ hg init rbsrepo && cd rbsrepo
$ echo "[experimental]" > .hg/hgrc $ echo "[experimental]" > .hg/hgrc
$ echo "evolution=true" >> .hg/hgrc $ echo "evolution=true" >> .hg/hgrc
$ echo "rebaseskipobsolete=on" >> .hg/hgrc
$ echo root > root && hg ci -Am root $ echo root > root && hg ci -Am root
adding root adding root
$ echo a > a && hg ci -Am a $ echo a > a && hg ci -Am a
adding a adding a
$ hg up 0 $ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b > b && hg ci -Am b $ echo b > b && hg ci -Am b
adding b adding b
| o 6:ecc93090a95c E | o 6:ecc93090a95c E
| | | |
| o 4:0dc878468a23 B3 | o 4:0dc878468a23 B3
| | | |
o | 1:96cc3511f894 C o | 1:96cc3511f894 C
/ /
o 0:426bada5c675 A o 0:426bada5c675 A
For some reasons (--hidden, rebaseskipobsolete=0, directaccess, etc.), For some reasons (--hidden, directaccess, etc.),
rebasestate may contain hidden hashes. "rebase --abort" should work regardless. rebasestate may contain hidden hashes. "rebase --abort" should work regardless.
$ hg init $TESTTMP/hidden-state1 $ hg init $TESTTMP/hidden-state1
$ cd $TESTTMP/hidden-state1 $ cd $TESTTMP/hidden-state1
$ cat >> .hg/hgrc <<EOF
> [experimental]
> rebaseskipobsolete=0
> EOF
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> C > C
> | > |
> D B # prune: B, C > D B # B/D=B
> |/ # B/D=B > |/
> A > A
> EOS > EOS
$ eval `hg tags -T '{tag}={node}\n'` $ eval `hg tags -T '{tag}={node}\n'`
$ rm .hg/localtags $ rm .hg/localtags
$ hg update -q $C --hidden $ hg update -q $C
updated to hidden changeset 7829726be4dc
(hidden revision '7829726be4dc' is pruned)
$ hg rebase -s $B -d $D $ hg rebase -s $B -d $D
rebasing 1:2ec65233581b "B" rebasing 1:2ec65233581b "B"
merging D merging D
warning: conflicts while merging D! (edit, then use 'hg resolve --mark') warning: conflicts while merging D! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') unresolved conflicts (see 'hg resolve', then 'hg rebase --continue')
[240] [240]
$ hg debugobsolete $B
1 new obsolescence markers
obsoleted 1 changesets
1 new orphan changesets
$ hg debugobsolete $C
1 new obsolescence markers
obsoleted 1 changesets
$ cp -R . $TESTTMP/hidden-state2 $ cp -R . $TESTTMP/hidden-state2
$ hg log -G $ hg log -G
@ 2:b18e25de2cf5 D @ 2:b18e25de2cf5 D
| |
| % 1:2ec65233581b B (pruned using prune) | % 1:2ec65233581b B (pruned)
|/ |/
o 0:426bada5c675 A o 0:426bada5c675 A
$ hg summary $ hg summary
parent: 2:b18e25de2cf5 tip parent: 2:b18e25de2cf5 tip
D D
branch: default branch: default
commit: 1 modified, 1 added, 1 unknown, 1 unresolved commit: 1 modified, 1 added, 1 unknown, 1 unresolved
update: 1 new changesets, 2 branch heads (merge) update: 1 new changesets, 2 branch heads (merge)
phases: 3 draft phases: 3 draft
rebase: 0 rebased, 2 remaining (rebase --continue) rebase: 0 rebased, 2 remaining (rebase --continue)
$ hg rebase --abort $ hg rebase --abort
rebase aborted rebase aborted
Also test --continue for the above case Also test --continue for the above case
$ cd $TESTTMP/hidden-state2 $ cd $TESTTMP/hidden-state2
$ hg resolve -m $ hg resolve -m
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase --continue $ hg rebase --continue
rebasing 1:2ec65233581b "B" note: not rebasing 1:2ec65233581b "B", it has no successor
rebasing 3:7829726be4dc tip "C" note: not rebasing 3:7829726be4dc tip "C", it has no successor
$ hg log -G $ hg log -G
@ 5:1964d5d5b547 C @ 2:b18e25de2cf5 D
|
o 4:68deb90c12a2 B
|
o 2:b18e25de2cf5 D
| |
o 0:426bada5c675 A o 0:426bada5c675 A
==================== ====================
Test --stop option | Test --stop option |
==================== ====================
$ cd .. $ cd ..
$ hg init rbstop $ hg init rbstop