Mercurial > evolve
annotate tests/test-topic-stack.t @ 3289:bd99cb54712b mercurial-4.1
test-compat: merge mercurial-4.2 into mercurial-4.1
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 11 Dec 2017 18:30:15 +0100 |
parents | 875de4816c5b b714709afe6a |
children | b21a3753255f |
rev | line source |
---|---|
2045
db617700d318
tests: move "test setup" script into a 'testlib' directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1998
diff
changeset
|
1 $ . "$TESTDIR/testlib/topic_setup.sh" |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 Initial setup |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
5 |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
6 $ cat << EOF >> $HGRCPATH |
2423
677dfbb8bdbf
test: enforce color to be enabled
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2045
diff
changeset
|
7 > [extensions] |
677dfbb8bdbf
test: enforce color to be enabled
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2045
diff
changeset
|
8 > color = |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 > [ui] |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 > logtemplate = {rev} {branch} \{{get(namespaces, "topics")}} {phase} {desc|firstline}\n |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
11 > [experimental] |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
12 > evolution=all |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 > EOF |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
15 $ hg init main |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
16 $ cd main |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
17 $ hg topic other |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2939
diff
changeset
|
18 marked working directory as topic: other |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 $ echo aaa > aaa |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 $ hg add aaa |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 $ hg commit -m c_a |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
22 active topic 'other' grew its first changeset |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
23 $ echo aaa > bbb |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
24 $ hg add bbb |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
25 $ hg commit -m c_b |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 $ hg topic foo |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 $ echo aaa > ccc |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 $ hg add ccc |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 $ hg commit -m c_c |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
30 active topic 'foo' grew its first changeset |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
31 $ echo aaa > ddd |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
32 $ hg add ddd |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 $ hg commit -m c_d |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 $ echo aaa > eee |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
35 $ hg add eee |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
36 $ hg commit -m c_e |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
37 $ echo aaa > fff |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
38 $ hg add fff |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
39 $ hg commit -m c_f |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
40 $ hg log -G |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 @ 5 default {foo} draft c_f |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
42 | |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
43 o 4 default {foo} draft c_e |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 | |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 o 3 default {foo} draft c_d |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 | |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
47 o 2 default {foo} draft c_c |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
48 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
49 o 1 default {other} draft c_b |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
50 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
51 o 0 default {other} draft c_a |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
1961
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
54 Check that topic without any parent does not crash --list |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
55 --------------------------------------------------------- |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
56 |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
57 $ hg up other |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
58 switching to topic other |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
59 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
60 $ hg topic --list |
1995
54d6dff699f0
stack: add some header with the topic name
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1991
diff
changeset
|
61 ### topic: other |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
62 ### target: default (branch) |
1961
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
63 t2@ c_b (current) |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
64 t1: c_a |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
65 $ hg phase --public 'topic("other")' |
2986
4746b92cc1f8
topics/ui: signal when an operation entails voiding a topic
Aurélien Campéas
parents:
2985
diff
changeset
|
66 active topic 'other' is now empty |
2911
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
67 |
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
68 After changing the phase of all the changesets in "other" to public, the topic should still be active, but is empty. We should be better at informating the user about it and displaying good data in this case. |
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
69 |
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
70 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
71 foo (4 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
72 * other (0 changesets) |
2911
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
73 $ hg stack |
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
74 ### topic: other |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
75 ### target: default (branch) |
2937
b54abc7e80e2
topics: improve the description if topic is not touched
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2936
diff
changeset
|
76 (stack is empty) |
3085
3eca2cbdc498
stack: order the adjective of changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3084
diff
changeset
|
77 t0^ c_b (base current) |
2911
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
78 |
1961
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
79 $ hg up foo |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
80 switching to topic foo |
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
81 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
82 |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
83 Simple test |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
84 ----------- |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
85 |
1973
e97458bf53be
stack: introduce and explicite command to display the stack
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1961
diff
changeset
|
86 'hg stack' list all changeset in the topic |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
87 |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
88 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
89 * foo (4 changesets) |
1973
e97458bf53be
stack: introduce and explicite command to display the stack
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1961
diff
changeset
|
90 $ hg stack |
1995
54d6dff699f0
stack: add some header with the topic name
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1991
diff
changeset
|
91 ### topic: foo |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
92 ### target: default (branch) |
1956
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
93 t4@ c_f (current) |
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
94 t3: c_e |
1954
61f36480740f
stack: start indexing at 't1' instead of 't0'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1953
diff
changeset
|
95 t2: c_d |
1956
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
96 t1: c_c |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2684
diff
changeset
|
97 t0^ c_b (base) |
2750
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
98 $ hg stack -v |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
99 ### topic: foo |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
100 ### target: default (branch) |
2750
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
101 t4(6559e6d93aea)@ c_f (current) |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
102 t3(0f9ac936c87d): c_e |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
103 t2(e629654d7050): c_d |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
104 t1(8522f9e3fee9): c_c |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
105 t0(ea705abc4f51)^ c_b (base) |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
106 $ hg stack -Tjson | python -m json.tool |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
107 [ |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
108 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
109 "isentry": true, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
110 "topic.stack.desc": "c_f", |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
111 "topic.stack.index": 4, |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
112 "topic.stack.state": [ |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
113 "current" |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
114 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
115 "topic.stack.state.symbol": "@" |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
116 }, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
117 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
118 "isentry": true, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
119 "topic.stack.desc": "c_e", |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
120 "topic.stack.index": 3, |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
121 "topic.stack.state": [ |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
122 "clean" |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
123 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
124 "topic.stack.state.symbol": ":" |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
125 }, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
126 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
127 "isentry": true, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
128 "topic.stack.desc": "c_d", |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
129 "topic.stack.index": 2, |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
130 "topic.stack.state": [ |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
131 "clean" |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
132 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
133 "topic.stack.state.symbol": ":" |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
134 }, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
135 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
136 "isentry": true, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
137 "topic.stack.desc": "c_c", |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
138 "topic.stack.index": 1, |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
139 "topic.stack.state": [ |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
140 "clean" |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
141 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
142 "topic.stack.state.symbol": ":" |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
143 }, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
144 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
145 "isentry": false, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
146 "topic.stack.desc": "c_b", |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2684
diff
changeset
|
147 "topic.stack.index": 0, |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
148 "topic.stack.state": [ |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
149 "base" |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
150 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
151 "topic.stack.state.symbol": "^" |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
152 } |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
153 ] |
2750
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
154 $ hg stack -v -Tjson | python -m json.tool |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
155 [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
156 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
157 "isentry": true, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
158 "topic.stack.desc": "c_f", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
159 "topic.stack.index": 4, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
160 "topic.stack.shortnode": "6559e6d93aea", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
161 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
162 "current" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
163 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
164 "topic.stack.state.symbol": "@" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
165 }, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
166 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
167 "isentry": true, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
168 "topic.stack.desc": "c_e", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
169 "topic.stack.index": 3, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
170 "topic.stack.shortnode": "0f9ac936c87d", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
171 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
172 "clean" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
173 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
174 "topic.stack.state.symbol": ":" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
175 }, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
176 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
177 "isentry": true, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
178 "topic.stack.desc": "c_d", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
179 "topic.stack.index": 2, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
180 "topic.stack.shortnode": "e629654d7050", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
181 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
182 "clean" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
183 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
184 "topic.stack.state.symbol": ":" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
185 }, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
186 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
187 "isentry": true, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
188 "topic.stack.desc": "c_c", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
189 "topic.stack.index": 1, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
190 "topic.stack.shortnode": "8522f9e3fee9", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
191 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
192 "clean" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
193 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
194 "topic.stack.state.symbol": ":" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
195 }, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
196 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
197 "isentry": false, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
198 "topic.stack.desc": "c_b", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
199 "topic.stack.index": 0, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
200 "topic.stack.shortnode": "ea705abc4f51", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
201 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
202 "base" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
203 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
204 "topic.stack.state.symbol": "^" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
205 } |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
206 ] |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
207 |
2805
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
208 check that topics and stack are available even if ui.strict=true |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
209 |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
210 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
211 * foo (4 changesets) |
2805
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
212 $ hg stack |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
213 ### topic: foo |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
214 ### target: default (branch) |
2805
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
215 t4@ c_f (current) |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
216 t3: c_e |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
217 t2: c_d |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
218 t1: c_c |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
219 t0^ c_b (base) |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
220 $ hg topics --config ui.strict=true |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
221 * foo (4 changesets) |
2805
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
222 $ hg stack --config ui.strict=true |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
223 ### topic: foo |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
224 ### target: default (branch) |
2805
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
225 t4@ c_f (current) |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
226 t3: c_e |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
227 t2: c_d |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
228 t1: c_c |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
229 t0^ c_b (base) |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
230 |
1895
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
231 error case, nothing to list |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
232 |
c8e4c6e03957
stack: add a very first version of stack display with 'hg topic --list'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
233 $ hg topic --clear |
1973
e97458bf53be
stack: introduce and explicite command to display the stack
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1961
diff
changeset
|
234 $ hg stack |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
235 ### target: default (branch) |
2937
b54abc7e80e2
topics: improve the description if topic is not touched
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2936
diff
changeset
|
236 (stack is empty) |
3085
3eca2cbdc498
stack: order the adjective of changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3084
diff
changeset
|
237 b0^ c_f (base current) |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
238 |
1904
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
239 Test "t#" reference |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
240 ------------------- |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
241 |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
242 |
1958
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
243 $ hg up t2 |
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
244 abort: cannot resolve "t2": no active topic |
1904
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
245 [255] |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
246 $ hg topic foo |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2939
diff
changeset
|
247 marked working directory as topic: foo |
1904
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
248 $ hg up t42 |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
249 abort: cannot resolve "t42": topic "foo" has only 4 changesets |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
250 [255] |
1958
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
251 $ hg up t2 |
1904
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
252 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1958
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
253 $ hg summary |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
254 parent: 3:e629654d7050 |
1958
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
255 c_d |
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
256 branch: default |
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
257 commit: (clean) |
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
258 update: (current) |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
259 phases: 4 draft |
1958
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
260 topic: foo |
1904
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
261 |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
262 Case with some of the topic unstable |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
263 ------------------------------------ |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
264 |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
265 $ echo bbb > ddd |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
266 $ hg commit --amend |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
267 $ hg log -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
268 @ 7 default {foo} draft c_d |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
269 | |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
270 | o 5 default {foo} draft c_f |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
271 | | |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
272 | o 4 default {foo} draft c_e |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
273 | | |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
274 | x 3 default {foo} draft c_d |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
275 |/ |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
276 o 2 default {foo} draft c_c |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
277 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
278 o 1 default {} public c_b |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
279 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
280 o 0 default {} public c_a |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
281 |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
282 $ hg topic --list |
1995
54d6dff699f0
stack: add some header with the topic name
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1991
diff
changeset
|
283 ### topic: foo |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
284 ### target: default (branch) |
1956
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
285 t4$ c_f (unstable) |
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
286 t3$ c_e (unstable) |
1954
61f36480740f
stack: start indexing at 't1' instead of 't0'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1953
diff
changeset
|
287 t2@ c_d (current) |
1956
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
288 t1: c_c |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2684
diff
changeset
|
289 t0^ c_b (base) |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
290 $ hg up t3 |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
291 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
292 $ hg topic --list |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
293 ### topic: foo |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
294 ### target: default (branch) |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
295 t4$ c_f (unstable) |
2626
bc36a608e9e4
stack: show unstable state for the current revision if it is one (issue5553)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2348
diff
changeset
|
296 t3$ c_e (current unstable) |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
297 t2: c_d |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
298 t1: c_c |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2684
diff
changeset
|
299 t0^ c_b (base) |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
300 $ hg topic --list --color=debug |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
301 [topic.stack.summary.topic|### topic: [topic.active|foo]] |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
302 [topic.stack.summary.branches|### target: default (branch)] |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
303 [topic.stack.index topic.stack.index.unstable|t4][topic.stack.state topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.unstable|c_f][topic.stack.state topic.stack.state.unstable| (unstable)] |
2626
bc36a608e9e4
stack: show unstable state for the current revision if it is one (issue5553)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2348
diff
changeset
|
304 [topic.stack.index topic.stack.index.current topic.stack.index.unstable|t3][topic.stack.state topic.stack.state.current topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.current topic.stack.desc.unstable|c_e][topic.stack.state topic.stack.state.current topic.stack.state.unstable| (current unstable)] |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
305 [topic.stack.index topic.stack.index.clean|t2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
306 [topic.stack.index topic.stack.index.clean|t1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c] |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2684
diff
changeset
|
307 [topic.stack.index topic.stack.index.base|t0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)] |
2348
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
308 $ hg up t2 |
5737e0680f10
ui: hg topic now display if current revision is in bad state (issue5533)
Boris Feld <boris.feld@octobus.net>
parents:
2341
diff
changeset
|
309 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
310 |
1910
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
311 Also test the revset: |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
312 |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
313 $ hg log -r 'stack()' |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
314 2 default {foo} draft c_c |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
315 7 default {foo} draft c_d |
1910
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
316 4 default {foo} draft c_e |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
317 5 default {foo} draft c_f |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
318 |
2681
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
319 $ hg log -r 'stack(foo)' |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
320 hg: parse error: stack() takes no argument, it works on current topic |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
321 [255] |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
322 |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
323 $ hg log -r 'stack(foobar)' |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
324 hg: parse error: stack() takes no argument, it works on current topic |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
325 [255] |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
326 |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
327 Case with multiple heads on the topic |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
328 ------------------------------------- |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
329 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
330 Make things linear again |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
331 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
332 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' |
3102
6604d96fc73c
test-compat: revert output change in rebase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3085
diff
changeset
|
333 rebasing 4:0f9ac936c87d "c_e" |
6604d96fc73c
test-compat: revert output change in rebase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3085
diff
changeset
|
334 rebasing 5:6559e6d93aea "c_f" |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
335 $ hg log -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
336 o 9 default {foo} draft c_f |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
337 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
338 o 8 default {foo} draft c_e |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
339 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
340 @ 7 default {foo} draft c_d |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
341 | |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
342 o 2 default {foo} draft c_c |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
343 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
344 o 1 default {} public c_b |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
345 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
346 o 0 default {} public c_a |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
347 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
348 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
349 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
350 Create the second branch |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
351 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
352 $ hg up 'desc(c_d)' |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
353 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
354 $ echo aaa > ggg |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
355 $ hg add ggg |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
356 $ hg commit -m c_g |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
357 $ echo aaa > hhh |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
358 $ hg add hhh |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
359 $ hg commit -m c_h |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
360 $ hg log -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
361 @ 11 default {foo} draft c_h |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
362 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
363 o 10 default {foo} draft c_g |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
364 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
365 | o 9 default {foo} draft c_f |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
366 | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
367 | o 8 default {foo} draft c_e |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
368 |/ |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
369 o 7 default {foo} draft c_d |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
370 | |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
371 o 2 default {foo} draft c_c |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
372 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
373 o 1 default {} public c_b |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
374 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
375 o 0 default {} public c_a |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
376 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
377 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
378 Test output |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
379 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
380 $ hg top -l |
1998
302be26a3fd8
stack: add warning about multiple heads
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1996
diff
changeset
|
381 ### topic: foo (2 heads) |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
382 ### target: default (branch) |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
383 t6: c_f |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
384 t5: c_e |
1991
ba79d23594d6
stack: reusing the index number in base when applicable
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1973
diff
changeset
|
385 t2^ c_d (base) |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
386 t4@ c_h (current) |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
387 t3: c_g |
1956
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
388 t2: c_d |
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
389 t1: c_c |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2684
diff
changeset
|
390 t0^ c_b (base) |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
391 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
392 Case with multiple heads on the topic with unstability involved |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
393 --------------------------------------------------------------- |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
394 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
395 We amend the message to make sure the display base pick the right changeset |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
396 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
397 $ hg up 'desc(c_d)' |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
398 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
399 $ echo ccc > ddd |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
400 $ hg commit --amend -m 'c_D' |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
401 $ hg rebase -d . -s 'desc(c_g)' |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
402 rebasing 10:81264ae8a36a "c_g" |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
403 rebasing 11:fde5f5941642 "c_h" |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
404 $ hg log -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
405 o 15 default {foo} draft c_h |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
406 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
407 o 14 default {foo} draft c_g |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
408 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
409 @ 13 default {foo} draft c_D |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
410 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
411 | o 9 default {foo} draft c_f |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
412 | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
413 | o 8 default {foo} draft c_e |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
414 | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
415 | x 7 default {foo} draft c_d |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
416 |/ |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
417 o 2 default {foo} draft c_c |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
418 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
419 o 1 default {} public c_b |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
420 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
421 o 0 default {} public c_a |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
422 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
423 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
424 $ hg topic --list |
1998
302be26a3fd8
stack: add warning about multiple heads
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1996
diff
changeset
|
425 ### topic: foo (2 heads) |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
426 ### target: default (branch) |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
427 t6$ c_f (unstable) |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
428 t5$ c_e (unstable) |
3085
3eca2cbdc498
stack: order the adjective of changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3084
diff
changeset
|
429 t2^ c_D (base current) |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
430 t4: c_h |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
431 t3: c_g |
1956
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
432 t2@ c_D (current) |
d8f1e432b16a
stack: reverse the display order
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1954
diff
changeset
|
433 t1: c_c |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2684
diff
changeset
|
434 t0^ c_b (base) |
2627
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
435 |
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
436 Trying to list non existing topic |
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
437 $ hg stack thisdoesnotexist |
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
438 abort: cannot resolve "thisdoesnotexist": no such topic found |
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
439 [255] |
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
440 $ hg topic --list thisdoesnotexist |
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
441 abort: cannot resolve "thisdoesnotexist": no such topic found |
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
442 [255] |
2684
90e11985d0cc
topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents:
2681
diff
changeset
|
443 |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
444 Complex cases where commits with same topic are not consecutive but are linear |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
445 ============================================================================== |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
446 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
447 $ hg log --graph |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
448 o 15 default {foo} draft c_h |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
449 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
450 o 14 default {foo} draft c_g |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
451 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
452 @ 13 default {foo} draft c_D |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
453 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
454 | o 9 default {foo} draft c_f |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
455 | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
456 | o 8 default {foo} draft c_e |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
457 | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
458 | x 7 default {foo} draft c_d |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
459 |/ |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
460 o 2 default {foo} draft c_c |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
461 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
462 o 1 default {} public c_b |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
463 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
464 o 0 default {} public c_a |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
465 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
466 Converting into a linear chain |
2927
01cf426bd458
tests: abstract version number for test-topic-stack.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2919
diff
changeset
|
467 $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()' |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
468 rebasing 8:215bc359096a "c_e" |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
469 rebasing 9:ec9267b3f33f "c_f" |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
470 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
471 $ hg log -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
472 o 17 default {foo} draft c_f |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
473 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
474 o 16 default {foo} draft c_e |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
475 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
476 o 15 default {foo} draft c_h |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
477 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
478 o 14 default {foo} draft c_g |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
479 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
480 @ 13 default {foo} draft c_D |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
481 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
482 o 2 default {foo} draft c_c |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
483 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
484 o 1 default {} public c_b |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
485 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
486 o 0 default {} public c_a |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
487 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
488 Changing topics on some commits in between |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
489 $ hg topic foobar -r 'desc(c_e) + desc(c_D)' |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
490 switching to topic foobar |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
491 changed topic on 2 changes |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
492 $ hg log -G |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
493 @ 19 default {foobar} draft c_D |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
494 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
495 | o 18 default {foobar} draft c_e |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
496 | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
497 | | o 17 default {foo} draft c_f |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
498 | | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
499 | | x 16 default {foo} draft c_e |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
500 | |/ |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
501 | o 15 default {foo} draft c_h |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
502 | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
503 | o 14 default {foo} draft c_g |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
504 | | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
505 | x 13 default {foo} draft c_D |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
506 |/ |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
507 o 2 default {foo} draft c_c |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
508 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
509 o 1 default {} public c_b |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
510 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
511 o 0 default {} public c_a |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
512 |
2927
01cf426bd458
tests: abstract version number for test-topic-stack.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2919
diff
changeset
|
513 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
514 rebasing 17:77082e55de88 "c_f" |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
515 switching to topic foo |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
516 switching to topic foobar |
2927
01cf426bd458
tests: abstract version number for test-topic-stack.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2919
diff
changeset
|
517 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
518 rebasing 14:0c3e8aed985d "c_g" |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
519 switching to topic foo |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
520 rebasing 15:b9e4f3709bc5 "c_h" |
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
521 rebasing 18:4bc813530301 "c_e" |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
522 switching to topic foobar |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
523 rebasing 20:4406ea4be852 "c_f" (tip) |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
524 switching to topic foo |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
525 switching to topic foobar |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
526 $ hg up |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
527 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
528 $ hg log --graph |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
529 o 24 default {foo} draft c_f |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
530 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
531 @ 23 default {foobar} draft c_e |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
532 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
533 o 22 default {foo} draft c_h |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
534 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
535 o 21 default {foo} draft c_g |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
536 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
537 o 19 default {foobar} draft c_D |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
538 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
539 o 2 default {foo} draft c_c |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
540 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
541 o 1 default {} public c_b |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
542 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
543 o 0 default {} public c_a |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
544 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
545 XXX: The following should show single heads |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
546 XXX: The behind count is weird, because the topic are interleaved. |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
547 |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
548 $ hg stack |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
549 ### topic: foobar |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
550 ### target: default (branch), 3 behind |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
551 t2@ c_e (current) |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
552 ^ c_h |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
553 t1: c_D |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
554 t0^ c_c (base) |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
555 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
556 $ hg stack foo |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
557 ### topic: foo |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
558 ### target: default (branch), ambiguous rebase destination - topic 'foo' has 3 heads |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
559 t4: c_f |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
560 ^ c_e |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
561 t3: c_h |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
562 t2: c_g |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
563 ^ c_D |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
564 t1: c_c |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
565 t0^ c_b (base) |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
566 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
567 case involving a merge |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
568 ---------------------- |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
569 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
570 $ cd .. |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
571 $ hg init stack-gap-merge |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
572 $ cd stack-gap-merge |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
573 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
574 $ echo aaa > aaa |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
575 $ hg commit -Am 'c_A' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
576 adding aaa |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
577 $ hg topic red |
2985
f63c97c01f92
topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas
parents:
2939
diff
changeset
|
578 marked working directory as topic: red |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
579 $ echo bbb > bbb |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
580 $ hg commit -Am 'c_B' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
581 adding bbb |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
582 active topic 'red' grew its first changeset |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
583 $ echo ccc > ccc |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
584 $ hg commit -Am 'c_C' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
585 adding ccc |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
586 $ hg topic blue |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
587 $ echo ddd > ddd |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
588 $ hg commit -Am 'c_D' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
589 adding ddd |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
590 active topic 'blue' grew its first changeset |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
591 $ hg up 'desc("c_B")' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
592 switching to topic red |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
593 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
594 $ echo eee > eee |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
595 $ hg commit -Am 'c_E' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
596 adding eee |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
597 $ echo fff > fff |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
598 $ hg commit -Am 'c_F' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
599 adding fff |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
600 $ hg topic blue |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
601 $ echo ggg > ggg |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
602 $ hg commit -Am 'c_G' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
603 adding ggg |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
604 $ hg up 'desc("c_D")' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
605 2 files updated, 0 files merged, 3 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
606 $ hg topic red |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
607 $ hg merge 'desc("c_G")' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
608 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
609 (branch merge, don't forget to commit) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
610 $ hg commit -Am 'c_H' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
611 $ hg topic blue |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
612 $ echo iii > iii |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
613 $ hg ci -Am 'c_I' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
614 adding iii |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
615 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
616 $ hg log -G |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
617 @ 8 default {blue} draft c_I |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
618 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
619 o 7 default {red} draft c_H |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
620 |\ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
621 | o 6 default {blue} draft c_G |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
622 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
623 | o 5 default {red} draft c_F |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
624 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
625 | o 4 default {red} draft c_E |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
626 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
627 o | 3 default {blue} draft c_D |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
628 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
629 o | 2 default {red} draft c_C |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
630 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
631 o 1 default {red} draft c_B |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
632 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
633 o 0 default {} draft c_A |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
634 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
635 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
636 $ hg stack red |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
637 ### topic: red |
2997
a61634f52742
topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2988
diff
changeset
|
638 ### target: default (branch), 6 behind |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
639 t5: c_H |
2918
0437158e0ed6
stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2917
diff
changeset
|
640 ^ c_G |
0437158e0ed6
stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2917
diff
changeset
|
641 ^ c_D |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
642 t4: c_C |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
643 t1^ c_B (base) |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
644 t3: c_F |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
645 t2: c_E |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
646 t1: c_B |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
647 t0^ c_A (base) |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
648 $ hg stack blue |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
649 ### topic: blue |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
650 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
651 t3@ c_I (current) |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
652 ^ c_H |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
653 t2: c_D |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
654 ^ c_C |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
655 t1: c_G |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
656 t0^ c_F (base) |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
657 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
658 Even with some obsolete and orphan changesets |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
659 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
660 (the ordering of each branch of "blue" change because their hash change. we |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
661 should stabilize this eventuelly) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
662 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
663 $ hg up 'desc("c_B")' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
664 switching to topic red |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
665 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
666 $ hg commit --amend --user test2 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
667 $ hg up 'desc("c_C")' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
668 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
669 $ hg commit --amend --user test2 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
670 $ hg up 'desc("c_D")' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
671 switching to topic blue |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
672 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
673 $ hg commit --amend --user test2 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
674 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
675 $ hg log -G --rev 'sort(all(), "topo")' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
676 @ 11 default {blue} draft c_D |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
677 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
678 | o 8 default {blue} draft c_I |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
679 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
680 | o 7 default {red} draft c_H |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
681 | |\ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
682 | | o 6 default {blue} draft c_G |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
683 | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
684 | | o 5 default {red} draft c_F |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
685 | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
686 | | o 4 default {red} draft c_E |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
687 | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
688 | x | 3 default {blue} draft c_D |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
689 |/ / |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
690 x / 2 default {red} draft c_C |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
691 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
692 | o 10 default {red} draft c_C |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
693 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
694 x 1 default {red} draft c_B |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
695 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
696 | o 9 default {red} draft c_B |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
697 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
698 o 0 default {} draft c_A |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
699 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
700 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
701 $ hg stack red |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
702 ### topic: red |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
703 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
704 t5$ c_H (unstable) |
2918
0437158e0ed6
stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2917
diff
changeset
|
705 ^ c_G |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
706 ^ c_D |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
707 t4$ c_C (unstable) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
708 t1^ c_B (base) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
709 t3$ c_F (unstable) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
710 t2$ c_E (unstable) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
711 t1: c_B |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
712 t0^ c_A (base) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
713 $ hg stack blue |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
714 ### topic: blue |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
715 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
716 t3$ c_I (unstable) |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
717 ^ c_H |
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
718 t2$ c_G (unstable) |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
719 ^ c_F |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
720 t1$ c_D (current unstable) |
3085
3eca2cbdc498
stack: order the adjective of changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3084
diff
changeset
|
721 t0^ c_C (base unstable) |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
722 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
723 more obsolescence |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
724 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
725 $ hg up 'max(desc("c_H"))' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
726 switching to topic red |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
727 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
728 $ hg commit --amend --user test3 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
729 $ hg up 'max(desc("c_G"))' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
730 switching to topic blue |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
731 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
732 $ hg commit --amend --user test3 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
733 $ hg up 'max(desc("c_B"))' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
734 switching to topic red |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
735 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
736 $ hg commit --amend --user test3 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
737 $ hg up 'max(desc("c_C"))' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
738 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
739 $ hg commit --amend --user test3 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
740 $ hg up 'max(desc("c_D"))' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
741 switching to topic blue |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
742 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
743 $ hg commit --amend --user test3 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
744 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
745 $ hg log -G --rev 'sort(all(), "topo")' |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
746 @ 16 default {blue} draft c_D |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
747 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
748 | o 13 default {blue} draft c_G |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
749 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
750 | | o 12 default {red} draft c_H |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
751 | | |\ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
752 | | | | o 8 default {blue} draft c_I |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
753 | | | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
754 | | +---x 7 default {red} draft c_H |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
755 | | | |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
756 | +---x 6 default {blue} draft c_G |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
757 | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
758 | o | 5 default {red} draft c_F |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
759 | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
760 | o | 4 default {red} draft c_E |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
761 | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
762 +---x 3 default {blue} draft c_D |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
763 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
764 x | 2 default {red} draft c_C |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
765 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
766 | o 15 default {red} draft c_C |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
767 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
768 x 1 default {red} draft c_B |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
769 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
770 | o 14 default {red} draft c_B |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
771 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
772 o 0 default {} draft c_A |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
773 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
774 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
775 $ hg stack red |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
776 ### topic: red |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
777 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
778 t5$ c_H (unstable) |
2918
0437158e0ed6
stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2917
diff
changeset
|
779 ^ c_G |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
780 ^ c_D |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
781 t4$ c_F (unstable) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
782 t3$ c_E (unstable) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
783 t1^ c_B (base) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
784 t2$ c_C (unstable) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
785 t1: c_B |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
786 t0^ c_A (base) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
787 $ hg stack blue |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
788 ### topic: blue |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
789 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
790 t3$ c_I (unstable) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
791 ^ c_H |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
792 t2$ c_G (unstable) |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
793 ^ c_F |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
794 t1$ c_D (current unstable) |
3085
3eca2cbdc498
stack: order the adjective of changeset
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3084
diff
changeset
|
795 t0^ c_C (base unstable) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
796 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
797 Test stack behavior with a split |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
798 -------------------------------- |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
799 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
800 get things linear again |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
801 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
802 $ hg rebase -r t1 -d default |
3102
6604d96fc73c
test-compat: revert output change in rebase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3085
diff
changeset
|
803 rebasing 16:1d84ec948370 "c_D" (tip) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
804 switching to topic blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
805 $ hg rebase -r t2 -d t1 |
3102
6604d96fc73c
test-compat: revert output change in rebase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3085
diff
changeset
|
806 rebasing 13:3ab2eedae500 "c_G" |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
807 $ hg rebase -r t3 -d t2 |
3102
6604d96fc73c
test-compat: revert output change in rebase
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3085
diff
changeset
|
808 rebasing 8:3bfe800e0486 "c_I" |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
809 $ hg stack |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
810 ### topic: blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
811 ### target: default (branch) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
812 t3: c_I |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
813 t2: c_G |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
814 t1@ c_D (current) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
815 t0^ c_A (base) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
816 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
817 making a split |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
818 (first get something to split) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
819 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
820 $ hg up t2 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
821 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
822 $ hg status --change . |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
823 A ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
824 $ echo zzz > Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
825 $ hg add Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
826 $ hg commit --amend |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
827 $ hg status --change . |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
828 A Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
829 A ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
830 $ hg stack |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
831 ### topic: blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
832 ### target: default (branch) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
833 t3$ c_I (unstable) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
834 t2@ c_G (current) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
835 t1: c_D |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
836 t0^ c_A (base) |
3108
9c9c8c1eeb93
test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3105
diff
changeset
|
837 $ hg --config extensions.evolve= --config ui.interactive=yes split --date '0 0' << EOF |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
838 > y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
839 > y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
840 > n |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
841 > y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
842 > EOF |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
843 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
844 adding Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
845 adding ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
846 diff --git a/Z b/Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
847 new file mode 100644 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
848 examine changes to 'Z'? [Ynesfdaq?] y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
849 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
850 @@ -0,0 +1,1 @@ |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
851 +zzz |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
852 record change 1/2 to 'Z'? [Ynesfdaq?] y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
853 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
854 diff --git a/ggg b/ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
855 new file mode 100644 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
856 examine changes to 'ggg'? [Ynesfdaq?] n |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
857 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
858 Done splitting? [yN] y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
859 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
860 $ hg --config extensions.evolve= obslog --all |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
861 o dde94df880e9 (22) c_G |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
862 | |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
863 | @ e7ea874afbd5 (23) c_G |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
864 |/ |
3105
f5d472b7e800
test-compat: revert output changes related to temporary amend commit
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3102
diff
changeset
|
865 x b24bab30ac12 (21) c_G |
3108
9c9c8c1eeb93
test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3105
diff
changeset
|
866 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (*) (glob) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
867 | |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
868 x 907f7d3c2333 (18) c_G |
3108
9c9c8c1eeb93
test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3105
diff
changeset
|
869 | rewritten as b24bab30ac12 by test (*) (glob) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
870 | |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
871 x 3ab2eedae500 (13) c_G |
3108
9c9c8c1eeb93
test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3105
diff
changeset
|
872 | rewritten as 907f7d3c2333 by test (*) (glob) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
873 | |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
874 x c7d60a180d05 (6) c_G |
3108
9c9c8c1eeb93
test-compat: merge with mercurial-4.3 branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3105
diff
changeset
|
875 rewritten as 3ab2eedae500 by test (*) (glob) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
876 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
877 $ hg export . |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
878 # HG changeset patch |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
879 # User test3 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
880 # Date 0 0 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
881 # Thu Jan 01 00:00:00 1970 +0000 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
882 # Node ID e7ea874afbd5c17aeee366d39a828dbcb01682ce |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
883 # Parent dde94df880e97f4a1ee8c5408254b429b3d90204 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
884 # EXP-Topic blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
885 c_G |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
886 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
887 diff -r dde94df880e9 -r e7ea874afbd5 ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
888 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
889 +++ b/ggg Thu Jan 01 00:00:00 1970 +0000 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
890 @@ -0,0 +1,1 @@ |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
891 +ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
892 $ hg export .^ |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
893 # HG changeset patch |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
894 # User test3 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
895 # Date 0 0 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
896 # Thu Jan 01 00:00:00 1970 +0000 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
897 # Node ID dde94df880e97f4a1ee8c5408254b429b3d90204 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
898 # Parent f3328cd199dc389b850ca952f65a15a8e6dbc79b |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
899 # EXP-Topic blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
900 c_G |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
901 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
902 diff -r f3328cd199dc -r dde94df880e9 Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
903 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
904 +++ b/Z Thu Jan 01 00:00:00 1970 +0000 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
905 @@ -0,0 +1,1 @@ |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
906 +zzz |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
907 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
908 Check that stack ouput still make sense |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
909 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
910 $ hg stack |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
911 ### topic: blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
912 ### target: default (branch) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
913 t4$ c_I (unstable) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
914 t3@ c_G (current) |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
915 t2: c_G |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
916 t1: c_D |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
917 t0^ c_A (base) |