Check we can find the topic extensions
$ cat >> $HGRCPATH <<EOF
> [defaults]
> amend=-d "0 0"
> fold=-d "0 0"
> [phases]
> publish = False
> [ui]
> logtemplate = {rev} - \{{get(namespaces, "topics")}} {node|short} {desc} ({phase})\n
> [diff]
> git = 1
> unified = 0
> [extensions]
> rebase =
> EOF
$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
$ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
> hg ci -m "add $1"
> }
Create a simple setup
$ hg init repoa
$ cd repoa
$ mkcommit aaa
$ mkcommit bbb
$ hg topic foo
marked working directory as topic: foo
$ mkcommit ccc
active topic 'foo' grew its first changeset
(see 'hg help topics' for more information)
$ mkcommit ddd
$ mkcommit eee
$ mkcommit fff
$ hg topic bar
$ mkcommit ggg
active topic 'bar' grew its first changeset
(see 'hg help topics' for more information)
$ mkcommit hhh
$ mkcommit iii
$ mkcommit jjj
$ hg log -G
@ 9 - {bar} 1d964213b023 add jjj (draft)
|
o 8 - {bar} fcab990f3261 add iii (draft)
|
o 7 - {bar} b0c2554835ac add hhh (draft)
|
o 6 - {bar} c748293f1c1a add ggg (draft)
|
o 5 - {foo} 6a6b7365c751 add fff (draft)
|
o 4 - {foo} 3969ab847d9c add eee (draft)
|
o 3 - {foo} 4e3a154f38c7 add ddd (draft)
|
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
o 1 - {} a4dbed0837ea add bbb (draft)
|
o 0 - {} 199cc73e9a0b add aaa (draft)
Test that evolve --all evolve the current topic
-----------------------------------------------
make a mess
$ hg up foo
switching to topic foo
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ hg topic -l
### topic: foo (?)
### branch: default (?)
### target: default (branch)
s4@ add fff (current)
s3: add eee
s2: add ddd
s1: add ccc
s0^ add bbb (base)
$ hg up 'desc(ddd)'
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo ddd >> ddd
$ hg amend
6 new unstable changesets
$ hg up 'desc(fff)'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo fff >> fff
$ hg amend
$ hg log -G
@ 13 - {foo} e104f49bab28 add fff (draft)
|
| o 11 - {foo} d9cacd156ffc add ddd (draft)
| |
| | o 9 - {bar} 1d964213b023 add jjj (draft)
| | |
| | o 8 - {bar} fcab990f3261 add iii (draft)
| | |
| | o 7 - {bar} b0c2554835ac add hhh (draft)
| | |
| | o 6 - {bar} c748293f1c1a add ggg (draft)
| | |
+---x 5 - {foo} 6a6b7365c751 add fff (draft)
| |
o | 4 - {foo} 3969ab847d9c add eee (draft)
| |
x | 3 - {foo} 4e3a154f38c7 add ddd (draft)
|/
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
o 1 - {} a4dbed0837ea add bbb (draft)
|
o 0 - {} 199cc73e9a0b add aaa (draft)
Run evolve --all
$ hg evolve --all
move:[4] add eee
atop:[11] add ddd
move:[13] add fff
atop:[14] add eee
working directory is now at 070c5573d8f9
$ hg log -G
@ 15 - {foo} 070c5573d8f9 add fff (draft)
|
o 14 - {foo} 42b49017ff90 add eee (draft)
|
o 11 - {foo} d9cacd156ffc add ddd (draft)
|
| o 9 - {bar} 1d964213b023 add jjj (draft)
| |
| o 8 - {bar} fcab990f3261 add iii (draft)
| |
| o 7 - {bar} b0c2554835ac add hhh (draft)
| |
| o 6 - {bar} c748293f1c1a add ggg (draft)
| |
| x 5 - {foo} 6a6b7365c751 add fff (draft)
| |
| x 4 - {foo} 3969ab847d9c add eee (draft)
| |
| x 3 - {foo} 4e3a154f38c7 add ddd (draft)
|/
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
o 1 - {} a4dbed0837ea add bbb (draft)
|
o 0 - {} 199cc73e9a0b add aaa (draft)
Test that evolve does not loose topic information
-------------------------------------------------
$ hg evolve --rev 'topic(bar)'
move:[6] add ggg
atop:[15] add fff
move:[7] add hhh
atop:[16] add ggg
move:[8] add iii
atop:[17] add hhh
move:[9] add jjj
atop:[18] add iii
working directory is now at 9bf430c106b7
$ hg log -G
@ 19 - {bar} 9bf430c106b7 add jjj (draft)
|
o 18 - {bar} d2dc89c57700 add iii (draft)
|
o 17 - {bar} 20bc4d02aa62 add hhh (draft)
|
o 16 - {bar} 16d6f664b17c add ggg (draft)
|
o 15 - {foo} 070c5573d8f9 add fff (draft)
|
o 14 - {foo} 42b49017ff90 add eee (draft)
|
o 11 - {foo} d9cacd156ffc add ddd (draft)
|
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
o 1 - {} a4dbed0837ea add bbb (draft)
|
o 0 - {} 199cc73e9a0b add aaa (draft)
Tests next and prev behavior
============================
Basic move are restricted to the current topic
$ hg up foo
switching to topic foo
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[14] add eee
$ hg next
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[15] add fff
$ hg next
no children on topic "foo"
do you want --no-topic
[1]
$ hg next --no-topic
switching to topic bar
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[16] add ggg
$ hg prev
preserving the current topic 'bar'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[15] add fff
$ hg prev
no parent in topic "bar"
(do you want --no-topic)
[1]
$ hg prev --no-topic
switching to topic foo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[14] add eee
Testing when instability is involved
$ hg log -G
o 19 - {bar} 9bf430c106b7 add jjj (draft)
|
o 18 - {bar} d2dc89c57700 add iii (draft)
|
o 17 - {bar} 20bc4d02aa62 add hhh (draft)
|
o 16 - {bar} 16d6f664b17c add ggg (draft)
|
o 15 - {foo} 070c5573d8f9 add fff (draft)
|
@ 14 - {foo} 42b49017ff90 add eee (draft)
|
o 11 - {foo} d9cacd156ffc add ddd (draft)
|
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
o 1 - {} a4dbed0837ea add bbb (draft)
|
o 0 - {} 199cc73e9a0b add aaa (draft)
$ hg topic -r 070c5573d8f9 bar
changed topic on 1 changes
$ hg up 16d6f664b17c
switching to topic bar
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg stack
### topic: bar
### target: default (branch)
s5$ add jjj (unstable)
s4$ add iii (unstable)
s3$ add hhh (unstable)
s2$ add ggg (current unstable)
s1: add fff
s0^ add eee (base)
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[20] add fff
Testing issue 5708 when we are on obsolete changeset and there is active topic
------------------------------------------------------------------------------
$ hg log --graph
@ 20 - {bar} 793eb6370b2d add fff (draft)
|
| o 19 - {bar} 9bf430c106b7 add jjj (draft)
| |
| o 18 - {bar} d2dc89c57700 add iii (draft)
| |
| o 17 - {bar} 20bc4d02aa62 add hhh (draft)
| |
| o 16 - {bar} 16d6f664b17c add ggg (draft)
| |
| x 15 - {foo} 070c5573d8f9 add fff (draft)
|/
o 14 - {foo} 42b49017ff90 add eee (draft)
|
o 11 - {foo} d9cacd156ffc add ddd (draft)
|
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
o 1 - {} a4dbed0837ea add bbb (draft)
|
o 0 - {} 199cc73e9a0b add aaa (draft)
$ hg topic
* bar (5 changesets, 4 troubled)
foo (3 changesets)
When the current topic, obsoleted changesets topic and successor topic are same
$ hg up 20bc4d02aa62
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foobar >> hhh
$ hg amend
$ hg up 20bc4d02aa62
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (20bc4d02aa62)
(use 'hg evolve' to update to its successor: d834582d9ee3)
$ hg log -Gr 14::
o 22 - {bar} d834582d9ee3 add hhh (draft)
|
| o 20 - {bar} 793eb6370b2d add fff (draft)
| |
| | o 19 - {bar} 9bf430c106b7 add jjj (draft)
| | |
| | o 18 - {bar} d2dc89c57700 add iii (draft)
| | |
+---@ 17 - {bar} 20bc4d02aa62 add hhh (draft)
| |
o | 16 - {bar} 16d6f664b17c add ggg (draft)
| |
x | 15 - {foo} 070c5573d8f9 add fff (draft)
|/
o 14 - {foo} 42b49017ff90 add eee (draft)
|
~
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[16] add ggg
When the current topic and successors topic are same, but obsolete cset has
different topic
$ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
rebasing 18:d2dc89c57700 "add iii"
rebasing 19:9bf430c106b7 "add jjj"
$ hg log -Gr 42b49017ff90::
o 24 - {bar} 7542e76aba2c add jjj (draft)
|
o 23 - {bar} 7858bd7e9906 add iii (draft)
|
o 22 - {bar} d834582d9ee3 add hhh (draft)
|
| o 20 - {bar} 793eb6370b2d add fff (draft)
| |
@ | 16 - {bar} 16d6f664b17c add ggg (draft)
| |
x | 15 - {foo} 070c5573d8f9 add fff (draft)
|/
o 14 - {foo} 42b49017ff90 add eee (draft)
|
~
$ hg up 070c5573d8f9
switching to topic foo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (070c5573d8f9)
(use 'hg evolve' to update to its successor: 793eb6370b2d)
$ hg topic bar
$ hg prev
no parent in topic "bar"
(do you want --no-topic)
[1]
When current topic and obsolete cset topic are same but successor has different
one
$ hg up 070c5573d8f9
switching to topic foo
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[14] add eee