This is an archive of the discontinued Mercurial Phabricator instance.

Differential D341

test-rebase-obsolete: add "\n" in template
AbandonedPublic

Authored by quark on Aug 11 2017, 1:41 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Summary

This makes the test a bit cleaner since log --stat does not need to
specify -T manually to keep its output readable.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Aug 11 2017, 1:41 AM
quark updated this revision to Diff 771.Aug 11 2017, 2:39 AM
martinvonz accepted this revision as: martinvonz.Aug 12 2017, 12:37 PM
martinvonz added a subscriber: martinvonz.

This makes the test a bit cleaner since log --stat does not need to

--stat should be -p

quark abandoned this revision.Aug 13 2017, 12:12 AM

D340 was updated to not use -p (which is not that useful since it diffs against p1) so this change becomes less necessary.

Revision Contents
Changeset List

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

Diff 767

tests/test-rebase-obsolete.t

========================== ==========================
Test rebase with obsolete Test rebase with obsolete
========================== ==========================
Enable obsolete Enable obsolete
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [ui] > [ui]
> logtemplate= {rev}:{node|short} {desc|firstline} > logtemplate= {rev}:{node|short} {desc|firstline}\n
> [experimental] > [experimental]
> evolution=createmarkers,allowunstable > evolution=createmarkers,allowunstable
> [phases] > [phases]
> publish=False > publish=False
> [extensions] > [extensions]
> rebase= > rebase=
> drawdag=$TESTDIR/drawdag.py > drawdag=$TESTDIR/drawdag.py
> EOF > EOF
5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (*) {'user': 'test'} (glob) 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b e273c5e7d2d29df783dce9f9eaa3ac4adc69c15d 0 (*) {'user': 'test'} (glob)
32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 (*) {'user': 'test'} (glob) 32af7686d403cf45b5d95f2d70cebea587ac806a cf44d2f5a9f4297a62be94cbdd3dff7c7dc54258 0 (*) {'user': 'test'} (glob)
42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 (*) {'user': 'test'} (glob) 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 7c6027df6a99d93f461868e5433f63bde20b6dfb 0 (*) {'user': 'test'} (glob)
Test that rewriting leaving instability behind is allowed Test that rewriting leaving instability behind is allowed
--------------------------------------------------------------------- ---------------------------------------------------------------------
$ hg log -r 'children(8)' $ hg log -r 'children(8)'
9:cf44d2f5a9f4 D (no-eol) 9:cf44d2f5a9f4 D
$ hg rebase -r 8 $ hg rebase -r 8
rebasing 8:e273c5e7d2d2 "C" rebasing 8:e273c5e7d2d2 "C"
$ hg log -G $ hg log -G
o 11:0d8f238b634c C o 11:0d8f238b634c C
| |
o 10:7c6027df6a99 B o 10:7c6027df6a99 B
| |
| o 9:cf44d2f5a9f4 D | o 9:cf44d2f5a9f4 D
> /| /| # replace: A -> C > /| /| # replace: A -> C
> A B C D # replace: B -> D > A B C D # replace: B -> D
> EOS > EOS
$ hg rebase -r ::E -d F $ hg rebase -r ::E -d F
note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C"
note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 3:058c1e1fb10a "D" note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 3:058c1e1fb10a "D"
rebasing 4:d6e82823588a "E" (E) rebasing 4:d6e82823588a "E" (E)
warning: cannot decide a unique merge base for 4:d6e82823588a, merge result may be suboptimal warning: cannot decide a unique merge base for 4:d6e82823588a, merge result may be suboptimal
$ hg log -Gp -T '{rev}:{node|short} {desc|firstline}\n' $ hg log -Gp
o 6:d0827eab33f0 E o 6:d0827eab33f0 E
| diff -r e0c929a964ce -r d0827eab33f0 A | diff -r e0c929a964ce -r d0827eab33f0 A
| --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000
| +++ b/A Thu Jan 01 00:00:00 1970 +0000 | +++ b/A Thu Jan 01 00:00:00 1970 +0000
| @@ -0,0 +1,1 @@ | @@ -0,0 +1,1 @@
| +A | +A
| \ No newline at end of file | \ No newline at end of file
| |
$ 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
created new head created new head
$ hg rebase -r 2 -d 1 $ hg rebase -r 2 -d 1
rebasing 2:1e9a3c00cbe9 "b" (tip) rebasing 2:1e9a3c00cbe9 "b" (tip)
$ hg log -r . # working dir is at rev 3 (successor of 2) $ hg log -r . # working dir is at rev 3 (successor of 2)
3:be1832deae9a b (no-eol) 3:be1832deae9a b
$ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now $ hg book -r 2 mybook --hidden # rev 2 has a bookmark on it now
$ hg up 2 && hg log -r . # working dir is at rev 2 again $ hg up 2 && hg log -r . # working dir is at rev 2 again
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2:1e9a3c00cbe9 b (no-eol) 2:1e9a3c00cbe9 b
$ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1
note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b"
Check that working directory was updated to rev 3 although rev 2 was skipped Check that working directory was updated to rev 3 although rev 2 was skipped
during the rebase operation during the rebase operation
$ hg log -r . $ hg log -r .
3:be1832deae9a b (no-eol) 3:be1832deae9a b
Check that bookmark was not moved to rev 3 if rev 2 was skipped during the Check that bookmark was not moved to rev 3 if rev 2 was skipped during the
rebase operation. This makes sense because if rev 2 has a successor, the rebase operation. This makes sense because if rev 2 has a successor, the
operation generating that successor (ex. rebase) should be responsible for operation generating that successor (ex. rebase) should be responsible for
moving bookmarks. If the bookmark is on a precursor, like rev 2, that means the moving bookmarks. If the bookmark is on a precursor, like rev 2, that means the
user manually moved it back. In that case we should not move it again. user manually moved it back. In that case we should not move it again.
$ hg bookmarks $ hg bookmarks
mybook 2:1e9a3c00cbe9 mybook 2:1e9a3c00cbe9
$ hg debugobsolete --rev tip $ hg debugobsolete --rev tip
1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (*) {'user': 'test'} (glob) 1e9a3c00cbe90d236ac05ef61efcc5e40b7412bc be1832deae9ac531caa7438b8dcf6055a122cd8e 0 (*) {'user': 'test'} (glob)