This is an archive of the discontinued Mercurial Phabricator instance.

Differential D94

tests: rewrite test-rebase-detach.t using drawdag
ClosedPublic

Authored by martinvonz on Jul 15 2017, 2:13 AM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHGd4df141f90d1: tests: rewrite test-rebase-detach.t using drawdag
rHG341935cdefa0: tests: rewrite test-rebase-detach.t using drawdag
Summary

This makes it much clearer because each test case can have exactly the
graph it wants (no extra cruft just because other tests want it).

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.Jul 15 2017, 2:13 AM
quark accepted this revision.Jul 15 2017, 1:55 PM
quark added a subscriber: quark.

Nice rewrite! I have gone through the history of this file, discussion at https://bz.mercurial-scm.org/1950 and all look good.

I think this can be committed as-is.

tests/test-rebase-detach.t
86

This test case seems removable. The --detach option was added by 66d954e76, and removed by 50f434510.

I guess you are aware of this and just wanted the new code to be functionally equivalent to the old code.

215–222

Could be slightly simplified to:

> H
> | G
> |/|
> F E
> |/
> A
martinvonz marked an inline comment as done.Jul 16 2017, 12:46 AM
martinvonz updated this revision to Diff 184.
martinvonz added inline comments.Jul 16 2017, 12:49 AM
tests/test-rebase-detach.t
86

True, it seems like something we test in about 10 other places in rebase tests. It also seems like the first test case in this file can be removed. It seems like that would be covered by the second. But yes, I just wanted to simplify in this patch.

durin42 accepted this revision.Jul 17 2017, 6:18 PM
This revision is now accepted and ready to land.Jul 17 2017, 6:18 PM
Closed by commit rHG341935cdefa0: tests: rewrite test-rebase-detach.t using drawdag (authored by martinvonz). · Explain WhyJul 18 2017, 2:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-rebase-detach.t (535 lines)

Diff 281

tests/test-rebase-detach.t

$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> rebase= > rebase=
> >
> [alias] > [alias]
> tglog = log -G --template "{rev}: '{desc}'\n" > tglog = log -G --template "{rev}: '{desc}'\n"
>
> [extensions]
> drawdag=$TESTDIR/drawdag.py
> EOF > EOF
Rebasing D onto B detaching from C (one commit):
$ hg init a $ hg init a1
$ cd a
$ hg unbundle "$TESTDIR/bundles/rebase.hg"
adding changesets
adding manifests
adding file changes
added 8 changesets with 7 changes to 7 files (+2 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up tip
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
Rebasing D onto H detaching from C:
$ hg clone -q -u . a a1
$ cd a1 $ cd a1
$ hg tglog $ hg debugdrawdag <<EOF
@ 7: 'H' > D
| > |
| o 6: 'G' > C B
|/| > |/
o | 5: 'F' > A
| | > EOF
| o 4: 'E' $ hg phase --force --secret D
|/
| o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg phase --force --secret 3 $ hg rebase -s D -d B
$ hg rebase -s 3 -d 7 rebasing 3:e7b3f00ed42e "D" (D tip)
rebasing 3:32af7686d403 "D" saved backup bundle to $TESTTMP/a1/.hg/strip-backup/e7b3f00ed42e-6f368371-rebase.hg (glob)
saved backup bundle to $TESTTMP/a1/.hg/strip-backup/32af7686d403-6f7dface-rebase.hg (glob)
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 7:secret 'D' o 3:secret 'D'
| |
@ 6:draft 'H'
|
| o 5:draft 'G'
|/|
o | 4:draft 'F'
| |
| o 3:draft 'E'
|/
| o 2:draft 'C' | o 2:draft 'C'
| | | |
| o 1:draft 'B' o | 1:draft 'B'
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B
D D
F
H
$ cd .. $ cd ..
Rebasing C onto H detaching from B: Rebasing D onto B detaching from C (two commits):
$ hg clone -q -u . a a2 $ hg init a2
$ cd a2 $ cd a2
$ hg tglog $ hg debugdrawdag <<EOF
@ 7: 'H' > E
| > |
| o 6: 'G' > D
|/| > |
o | 5: 'F' > C B
| | > |/
| o 4: 'E' > A
|/ > EOF
| o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase -s 2 -d 7 $ hg rebase -s D -d B
rebasing 2:5fddd98957c8 "C" rebasing 3:e7b3f00ed42e "D" (D)
rebasing 3:32af7686d403 "D" rebasing 4:69a34c08022a "E" (E tip)
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) saved backup bundle to $TESTTMP/a2/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob)
$ hg tglog $ hg tglog
o 7: 'D' o 4: 'E'
|
o 6: 'C'
| |
@ 5: 'H' o 3: 'D'
| |
| o 4: 'G' | o 2: 'C'
|/|
o | 3: 'F'
| | | |
| o 2: 'E' o | 1: 'B'
|/
| o 1: 'B'
|/ |/
o 0: 'A' o 0: 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
C B
D D
F E
H
$ cd .. $ cd ..
Rebasing C onto B using detach (same as not using it):
quarkUnsubmitted
Not Done

This test case seems removable. The --detach option was added by 66d954e76, and removed by 50f434510.

I guess you are aware of this and just wanted the new code to be functionally equivalent to the old code.

quark: This test case seems removable. The `--detach` option was added by 66d954e76, and removed by…
martinvonzAuthorUnsubmitted
Not Done

True, it seems like something we test in about 10 other places in rebase tests. It also seems like the first test case in this file can be removed. It seems like that would be covered by the second. But yes, I just wanted to simplify in this patch.

martinvonz: True, it seems like something we test in about 10 other places in rebase tests. It also seems…
Rebasing B onto H using detach (same as not using it): $ hg init a3
$ hg clone -q -u . a a3
$ cd a3 $ cd a3
$ hg tglog $ hg debugdrawdag <<EOF
@ 7: 'H' > D
| > |
| o 6: 'G' > C B
|/| > |/
o | 5: 'F' > A
| | > EOF
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase -s 1 -d 7 $ hg rebase -s C -d B
rebasing 1:42ccdea3bb16 "B" rebasing 2:dc0947a82db8 "C" (C)
rebasing 2:5fddd98957c8 "C" rebasing 3:e7b3f00ed42e "D" (D tip)
rebasing 3:32af7686d403 "D" saved backup bundle to $TESTTMP/a3/.hg/strip-backup/dc0947a82db8-b8481714-rebase.hg (glob)
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob)
$ hg tglog $ hg tglog
o 7: 'D' o 3: 'D'
|
o 6: 'C'
| |
o 5: 'B' o 2: 'C'
| |
@ 4: 'H' o 1: 'B'
| |
| o 3: 'G'
|/|
o | 2: 'F'
| |
| o 1: 'E'
|/
o 0: 'A' o 0: 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
B B
C C
D D
F
H
$ cd .. $ cd ..
Rebasing C onto H detaching from B and collapsing: Rebasing D onto B detaching from C and collapsing:
$ hg clone -q -u . a a4 $ hg init a4
$ cd a4 $ cd a4
$ hg phase --force --secret 3
$ hg tglog $ hg debugdrawdag <<EOF
@ 7: 'H' > E
| > |
| o 6: 'G' > D
|/| > |
o | 5: 'F' > C B
| | > |/
| o 4: 'E' > A
|/ > EOF
| o 3: 'D' $ hg phase --force --secret E
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase --collapse -s 2 -d 7 $ hg rebase --collapse -s D -d B
rebasing 2:5fddd98957c8 "C" rebasing 3:e7b3f00ed42e "D" (D)
rebasing 3:32af7686d403 "D" rebasing 4:69a34c08022a "E" (E tip)
saved backup bundle to $TESTTMP/a4/.hg/strip-backup/5fddd98957c8-f9244fa1-rebase.hg (glob) saved backup bundle to $TESTTMP/a4/.hg/strip-backup/e7b3f00ed42e-a2ec7cea-rebase.hg (glob)
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
o 6:secret 'Collapsed revision o 3:secret 'Collapsed revision
| * C | * D
| * D' | * E'
@ 5:draft 'H' | o 2:draft 'C'
|
| o 4:draft 'G'
|/|
o | 3:draft 'F'
| | | |
| o 2:draft 'E' o | 1:draft 'B'
|/
| o 1:draft 'B'
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ hg manifest --rev tip $ hg manifest --rev tip
A A
C B
D D
F E
H
$ cd .. $ cd ..
Rebasing across null as ancestor Rebasing across null as ancestor
$ hg clone -q -U a a5 $ hg init a5
$ cd a5 $ cd a5
$ echo x > x $ hg debugdrawdag <<EOF
> E
$ hg add x > |
> D
$ hg ci -m "extra branch" > |
created new head > C
> |
$ hg tglog > A B
@ 8: 'extra branch' > EOF
o 7: 'H'
|
| o 6: 'G'
|/|
o | 5: 'F'
| |
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2: 'C'
| |
| o 1: 'B'
|/
o 0: 'A'
$ hg rebase -s 1 -d tip $ hg rebase -s C -d B
rebasing 1:42ccdea3bb16 "B" rebasing 2:dc0947a82db8 "C" (C)
rebasing 2:5fddd98957c8 "C" rebasing 3:e7b3f00ed42e "D" (D)
rebasing 3:32af7686d403 "D" rebasing 4:69a34c08022a "E" (E tip)
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/42ccdea3bb16-3cb021d3-rebase.hg (glob) saved backup bundle to $TESTTMP/a5/.hg/strip-backup/dc0947a82db8-3eefec98-rebase.hg (glob)
$ hg tglog $ hg tglog
o 8: 'D' o 4: 'E'
| |
o 7: 'C' o 3: 'D'
| |
o 6: 'B' o 2: 'C'
| |
@ 5: 'extra branch' o 1: 'B'
o 4: 'H'
|
| o 3: 'G'
|/|
o | 2: 'F'
| |
| o 1: 'E'
|/
o 0: 'A' o 0: 'A'
$ hg rebase -d 1 -s 3
$ hg rebase -d 5 -s 7 rebasing 3:e9153d36a1af "D"
rebasing 7:13547172c9c0 "C" rebasing 4:e3d0c70d606d "E" (tip)
rebasing 8:4e27a76c371a "D" (tip) saved backup bundle to $TESTTMP/a5/.hg/strip-backup/e9153d36a1af-db7388ed-rebase.hg (glob)
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/13547172c9c0-35685ded-rebase.hg (glob)
$ hg tglog $ hg tglog
o 8: 'D' o 4: 'E'
| |
o 7: 'C' o 3: 'D'
| |
| o 6: 'B' | o 2: 'C'
|/ |/
@ 5: 'extra branch' o 1: 'B'
o 4: 'H'
|
| o 3: 'G'
|/|
o | 2: 'F'
| |
| o 1: 'E'
|/
o 0: 'A' o 0: 'A'
$ cd .. $ cd ..
Verify that target is not selected as external rev (issue3085) Verify that target is not selected as external rev (issue3085)
$ hg clone -q -U a a6 $ hg init a6
$ cd a6 $ cd a6
$ hg up -q 6
$ hg debugdrawdag <<EOF
> H
> | G
> |/|
> F E
> |/
> A
> EOF
$ hg up -q G
quarkUnsubmitted
Done

Could be slightly simplified to:

> H
> | G
> |/|
> F E
> |/
> A
quark: Could be slightly simplified to: ``` > H > | G > |/| > F E > |/ > A ```
$ echo "I" >> E $ echo "I" >> E
$ hg ci -m "I" $ hg ci -m "I"
$ hg merge 7 $ hg tag --local I
$ hg merge H
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ hg ci -m "Merge" $ hg ci -m "Merge"
$ echo "J" >> F $ echo "J" >> F
$ hg ci -m "J" $ hg ci -m "J"
$ hg tglog
@ 7: 'J'
|
o 6: 'Merge'
|\
| o 5: 'I'
| |
o | 4: 'H'
| |
| o 3: 'G'
|/|
o | 2: 'F'
| |
| o 1: 'E'
|/
o 0: 'A'
$ hg rebase -s 8 -d 7 --collapse --config ui.merge=internal:other $ hg rebase -s I -d H --collapse --config ui.merge=internal:other
rebasing 8:9790e768172d "I" rebasing 5:b92d164ad3cb "I" (I)
rebasing 9:5d7b11f5fb97 "Merge" rebasing 6:0cfbc7e8faaf "Merge"
rebasing 10:9427d4d5af81 "J" (tip) rebasing 7:c6aaf0d259c0 "J" (tip)
saved backup bundle to $TESTTMP/a6/.hg/strip-backup/9790e768172d-c2111e9d-rebase.hg (glob) saved backup bundle to $TESTTMP/a6/.hg/strip-backup/b92d164ad3cb-88fd7ab7-rebase.hg (glob)
$ hg tglog $ hg tglog
@ 8: 'Collapsed revision @ 5: 'Collapsed revision
| * I | * I
| * Merge | * Merge
| * J' | * J'
o 7: 'H' o 4: 'H'
| |
| o 6: 'G' | o 3: 'G'
|/| |/|
o | 5: 'F' o | 2: 'F'
| |
| o 4: 'E'
|/
| o 3: 'D'
| |
| o 2: 'C'
| | | |
| o 1: 'B' | o 1: 'E'
|/ |/
o 0: 'A' o 0: 'A'
$ hg log --rev tip $ hg log --rev tip
changeset: 8:9472f4b1d736 changeset: 5:65079693dac4
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: Collapsed revision summary: Collapsed revision
$ cd .. $ cd ..
Ensure --continue restores a correct state (issue3046) and phase: Ensure --continue restores a correct state (issue3046) and phase:
$ hg clone -q a a7 $ hg init a7
$ cd a7 $ cd a7
$ hg up -q 3
$ echo 'H2' > H $ hg debugdrawdag <<EOF
$ hg ci -A -m 'H2' > C B
adding H > |/
$ hg phase --force --secret 8 > A
$ hg rebase -s 8 -d 7 --config ui.merge=internal:fail > EOF
rebasing 8:6215fafa5447 "H2" (tip) $ hg up -q C
merging H $ echo 'B2' > B
warning: conflicts while merging H! (edit, then use 'hg resolve --mark') $ hg ci -A -m 'B2'
adding B
$ hg phase --force --secret .
$ hg rebase -s . -d B --config ui.merge=internal:fail
rebasing 3:17b4880d2402 "B2" (tip)
merging B
warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
unresolved conflicts (see hg resolve, then hg rebase --continue) unresolved conflicts (see hg resolve, then hg rebase --continue)
[1] [1]
$ hg resolve --all -t internal:local $ hg resolve --all -t internal:local
(no more unresolved files) (no more unresolved files)
continue: hg rebase --continue continue: hg rebase --continue
$ hg rebase -c $ hg rebase -c
rebasing 8:6215fafa5447 "H2" (tip) rebasing 3:17b4880d2402 "B2" (tip)
note: rebase of 8:6215fafa5447 created no changes to commit note: rebase of 3:17b4880d2402 created no changes to commit
saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-5804ebd5-rebase.hg (glob) saved backup bundle to $TESTTMP/a7/.hg/strip-backup/17b4880d2402-1ae1f6cc-rebase.hg (glob)
$ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n" $ hg log -G --template "{rev}:{phase} '{desc}' {branches}\n"
@ 7:draft 'H' o 2:draft 'C'
| |
| o 6:draft 'G' | @ 1:draft 'B'
|/|
o | 5:draft 'F'
| |
| o 4:draft 'E'
|/
| o 3:draft 'D'
| |
| o 2:draft 'C'
| |
| o 1:draft 'B'
|/ |/
o 0:draft 'A' o 0:draft 'A'
$ cd .. $ cd ..