This is an archive of the discontinued Mercurial Phabricator instance.

Differential D163

test-restack: add a case demonstrating restack rebase a single commit twice
ClosedPublic

Authored by quark on Jul 21 2017, 1:11 AM.
Tags
None
Subscribers
None

Details

Reviewers
kulshrax
Group Reviewers
Restricted Project
Commits
rFBHGX53d2c31bbdaa: test-restack: add a case demonstrating restack rebase a single commit twice
Summary

The test shows that rebase moves "D" twice while it could have moved it only
once. It is a side effect when I spent 1.5 hours on investigating a user
report that a commit was duplicated with amend --rebase somehow. I didn't
have conclusion about that report (maybe it's because old inhibit was
used?), but thought it's nice to have this interesting test case added.

If hg rebase -r C -d B2 -q were moved after hg commit --amend -m B3,
then restack will move "D" only once.

It can be solved by using another topo sort, which was planned in the
multi-dest series [1].

[1]: https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-June/100247.html

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Jul 21 2017, 1:11 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 21 2017, 1:11 AM
quark edited the summary of this revision. (Show Details)Jul 21 2017, 1:14 AM
kulshrax accepted this revision.Jul 21 2017, 1:14 AM
This revision is now accepted and ready to land.Jul 21 2017, 1:14 AM
Closed by commit rFBHGX53d2c31bbdaa: test-restack: add a case demonstrating restack rebase a single commit twice (authored by quark). · Explain WhyJul 21 2017, 11:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-fbamend-restack.t (54 lines)

Diff 371

tests/test-fbamend-restack.t

Set up test environment. Set up test environment.
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> drawdag=$RUNTESTDIR/drawdag.py
> fbamend=$TESTDIR/../hgext3rd/fbamend > fbamend=$TESTDIR/../hgext3rd/fbamend
> inhibit=$TESTDIR/../hgext3rd/inhibit.py > inhibit=$TESTDIR/../hgext3rd/inhibit.py
> rebase= > rebase=
> [experimental] > [experimental]
> allowdivergence = True > allowdivergence = True
> evolution = createmarkers, allowunstable > evolution = createmarkers, allowunstable
> [fbamend] > [fbamend]
> # do not write preamend bookmarks > # do not write preamend bookmarks
| | | |
| o 9 add e | o 9 add e
|/ |/
@ 5 add b @ 5 add b
| |
| x 1 add b | x 1 add b
|/ |/
o 0 add a o 0 add a
Suboptimal case: restack rebases "D" twice
$ reset
$ hg debugdrawdag<<'EOS'
> D
> |
> C
> |
> B
> |
> A
> EOS
$ hg update B -q
$ hg commit --amend -m B2 -q 2>/dev/null
$ hg tag --local B2
$ hg rebase -r C -d B2 -q
$ hg commit --amend -m B3 -q 2>/dev/null
$ hg tag --local B3
$ showgraph
@ 6 B3
|
| o 5 C
| |
| x 4 B2
|/
| o 3 D
| |
| x 2 C
| |
| x 1 B
|/
o 0 A
$ hg rebase --restack
rebasing 3:f585351a92f8 "D" (D)
rebasing 5:ca53c8ceb284 "C"
rebasing 7:4da953fe10f3 "D"
$ showgraph
o 9 D
|
o 8 C
|
@ 6 B3
|
| x 4 B2
|/
| x 3 D
| |
| x 2 C
| |
| x 1 B
|/
o 0 A