Mercurial > evolve
annotate tests/test-topic-stack.t @ 4287:b7b6a4524ef7
safeguard: don't reimplement auto-publish if it's in core (will be in 4.9)
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 01 Dec 2018 16:08:42 +0800 |
parents | 69fb9e41ce2b |
children | 8f54ab5dd4e2 |
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 |
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
|
7 > [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
|
8 > 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
|
9 > [experimental] |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
10 > 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
|
11 > 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
|
12 |
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 $ 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
|
14 $ 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
|
15 $ 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
|
16 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
|
17 $ 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
|
18 $ 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
|
19 $ 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
|
20 active topic 'other' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3567
diff
changeset
|
21 (see 'hg help topics' for more information) |
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
|
22 $ 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
|
23 $ 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
|
24 $ 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
|
25 $ 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
|
26 $ 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
|
27 $ 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
|
28 $ 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
|
29 active topic 'foo' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3567
diff
changeset
|
30 (see 'hg help topics' for more information) |
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) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
63 s2@ c_b (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
64 s1: 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 |
3770
eb928f5728c4
topic: suggest to clear a topic that becomes empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3769
diff
changeset
|
67 (use 'hg topic --clear' to clear it if needed) |
2911
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
68 |
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
69 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
|
70 |
8874e65343a4
tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2805
diff
changeset
|
71 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
72 foo (4 changesets) |
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
73 * 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
|
74 $ 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
|
75 ### 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
|
76 ### target: default (branch) |
2937
b54abc7e80e2
topics: improve the description if topic is not touched
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2936
diff
changeset
|
77 (stack is empty) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
78 s0^ 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
|
79 |
1961
d9c7fced94fc
stack: prevent crash when topic is rooted on nullid
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1960
diff
changeset
|
80 $ 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
|
81 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
|
82 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
|
83 |
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
|
84 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
|
85 ----------- |
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
|
86 |
1973
e97458bf53be
stack: introduce and explicite command to display the stack
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1961
diff
changeset
|
87 '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
|
88 |
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
|
89 $ hg topic |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
90 * 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
|
91 $ 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
|
92 ### 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
|
93 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
94 s4@ c_f (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
95 s3: c_e |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
96 s2: c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
97 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
98 s0^ c_b (base) |
2750
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
99 $ hg stack -v |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
100 ### 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
|
101 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
102 s4(6559e6d93aea)@ c_f (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
103 s3(0f9ac936c87d): c_e |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
104 s2(e629654d7050): c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
105 s1(8522f9e3fee9): c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
106 s0(ea705abc4f51)^ c_b (base) |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
107 $ hg stack -Tjson | python -m json.tool |
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 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
110 "isentry": true, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
111 "topic.stack.desc": "c_f", |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
112 "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
|
113 "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
|
114 "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
|
115 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
116 "topic.stack.state.symbol": "@" |
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 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
119 "isentry": true, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
120 "topic.stack.desc": "c_e", |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
121 "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
|
122 "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
|
123 "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
|
124 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
125 "topic.stack.state.symbol": ":" |
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 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
128 "isentry": true, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
129 "topic.stack.desc": "c_d", |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
130 "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
|
131 "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
|
132 "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
|
133 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
134 "topic.stack.state.symbol": ":" |
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 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
137 "isentry": true, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
138 "topic.stack.desc": "c_c", |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
139 "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
|
140 "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
|
141 "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
|
142 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
143 "topic.stack.state.symbol": ":" |
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 { |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
146 "isentry": false, |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
147 "topic.stack.desc": "c_b", |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2684
diff
changeset
|
148 "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
|
149 "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
|
150 "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
|
151 ], |
2341
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
152 "topic.stack.state.symbol": "^" |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
153 } |
a5117a5becf8
ui: Fix hg stack json output
Boris Feld <boris.feld@octobus.net>
parents:
2045
diff
changeset
|
154 ] |
2750
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
155 $ 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
|
156 [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
157 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
158 "isentry": true, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
159 "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
|
160 "topic.stack.index": 4, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
161 "topic.stack.shortnode": "6559e6d93aea", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
162 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
163 "current" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
164 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
165 "topic.stack.state.symbol": "@" |
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 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
168 "isentry": true, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
169 "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
|
170 "topic.stack.index": 3, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
171 "topic.stack.shortnode": "0f9ac936c87d", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
172 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
173 "clean" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
174 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
175 "topic.stack.state.symbol": ":" |
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 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
178 "isentry": true, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
179 "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
|
180 "topic.stack.index": 2, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
181 "topic.stack.shortnode": "e629654d7050", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
182 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
183 "clean" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
184 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
185 "topic.stack.state.symbol": ":" |
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 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
188 "isentry": true, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
189 "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
|
190 "topic.stack.index": 1, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
191 "topic.stack.shortnode": "8522f9e3fee9", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
192 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
193 "clean" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
194 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
195 "topic.stack.state.symbol": ":" |
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 { |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
198 "isentry": false, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
199 "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
|
200 "topic.stack.index": 0, |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
201 "topic.stack.shortnode": "ea705abc4f51", |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
202 "topic.stack.state": [ |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
203 "base" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
204 ], |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
205 "topic.stack.state.symbol": "^" |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
206 } |
bd3824d1b795
stack: show short node of changesets in `hg stack -v`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2712
diff
changeset
|
207 ] |
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
|
208 |
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
|
209 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
|
210 |
a789b9d5b60c
topic: make command names valid as expected, even if ui.strict=true
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
2750
diff
changeset
|
211 $ hg topics |
3060
f43a310c4338
topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3018
diff
changeset
|
212 * 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
|
213 $ 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
|
214 ### 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
|
215 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
216 s4@ c_f (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
217 s3: c_e |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
218 s2: c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
219 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
220 s0^ c_b (base) |
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
|
221 $ 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
|
222 * 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
|
223 $ 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
|
224 ### 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
|
225 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
226 s4@ c_f (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
227 s3: c_e |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
228 s2: c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
229 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
230 s0^ c_b (base) |
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
|
231 |
4285
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
232 merge case (displaying info about external) |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
233 ------------------------------------------- |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
234 |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
235 $ hg up default |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
236 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
237 $ hg topics zzz |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
238 marked working directory as topic: zzz |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
239 $ echo zzz > zzz |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
240 $ hg add zzz |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
241 $ hg commit -m zzz_a |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
242 active topic 'zzz' grew its first changeset |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
243 (see 'hg help topics' for more information) |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
244 $ hg merge foo |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
245 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
246 (branch merge, don't forget to commit) |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
247 $ hg commit -m "merged foo" |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
248 |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
249 stack -m display data about child |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
250 |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
251 $ hg stack foo |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
252 ### topic: foo |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
253 ### target: default (branch) |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
254 s4: c_f |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
255 s3: c_e |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
256 s2: c_d |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
257 s1: c_c |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
258 s0^ c_b (base) |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
259 |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
260 $ hg stack foo --children |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
261 ### topic: foo |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
262 ### target: default (branch) |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
263 s4: c_f (external-children) |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
264 s3: c_e |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
265 s2: c_d |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
266 s1: c_c |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
267 s0^ c_b (base) |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
268 |
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
|
269 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
|
270 |
4285
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
271 $ hg strip --config extensions.strip= t1 --no-backup |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
272 0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
273 |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
274 $ hg up foo |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
275 switching to topic foo |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
276 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69fb9e41ce2b
stack: add a --children flag to stack
James Reynolds <jreynolds@backstage.com>
parents:
4268
diff
changeset
|
277 |
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
|
278 $ 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
|
279 $ 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
|
280 ### target: default (branch) |
2937
b54abc7e80e2
topics: improve the description if topic is not touched
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2936
diff
changeset
|
281 (stack is empty) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
282 s0^ 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
|
283 |
1904
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
284 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
|
285 ------------------- |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
286 |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
287 |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
288 $ hg up s2 |
4066
1aa5f851d2c0
stack: clarify s# error message in case of branch
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4065
diff
changeset
|
289 abort: cannot resolve "s2": branch "default" has only 0 non-public changesets |
1904
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
290 [255] |
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
291 $ 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
|
292 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
|
293 $ 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
|
294 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
|
295 [255] |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
296 $ hg up s42 |
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
297 abort: cannot resolve "s42": topic "foo" has only 4 changesets |
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
298 [255] |
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
299 $ hg up s2 |
1904
f52c02bf47b7
stack: allow to refer to changeset using "t2" form
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1898
diff
changeset
|
300 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
|
301 $ 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
|
302 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
|
303 c_d |
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
304 branch: default |
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
305 commit: (clean) |
62d5d4206840
stack: also change the indexing of the t# reference
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1957
diff
changeset
|
306 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
|
307 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
|
308 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
|
309 |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
310 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
|
311 ------------------------------------ |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
312 |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
313 $ echo bbb > ddd |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
314 $ hg commit --amend |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
315 2 new orphan changesets |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
316 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
317 @ 6 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
|
318 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
319 | * 5 default {foo} draft c_f |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
320 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
321 | * 4 default {foo} draft c_e |
1896
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
322 | | |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
323 | 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
|
324 |/ |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
325 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
|
326 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
327 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
|
328 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
329 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
|
330 |
4ae421cbb07c
stack: exclude obsolete changeset from the set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1895
diff
changeset
|
331 $ 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
|
332 ### 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
|
333 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
334 s4$ c_f (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
335 s3$ c_e (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
336 s2@ c_d (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
337 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
338 s0^ c_b (base) |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
339 $ hg up s3 |
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
|
340 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
|
341 $ 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
|
342 ### 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
|
343 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
344 s4$ c_f (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
345 s3$ c_e (current unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
346 s2: c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
347 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
348 s0^ 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
|
349 $ 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
|
350 [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
|
351 [topic.stack.summary.branches|### target: default (branch)] |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
352 [topic.stack.index topic.stack.index.unstable|s4][topic.stack.state topic.stack.state.unstable|$] [topic.stack.desc topic.stack.desc.unstable|c_f][topic.stack.state topic.stack.state.unstable| (unstable)] |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
353 [topic.stack.index topic.stack.index.current topic.stack.index.unstable|s3][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)] |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
354 [topic.stack.index topic.stack.index.clean|s2][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_d] |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
355 [topic.stack.index topic.stack.index.clean|s1][topic.stack.state topic.stack.state.clean|:] [topic.stack.desc topic.stack.desc.clean|c_c] |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
356 [topic.stack.index topic.stack.index.base|s0][topic.stack.state topic.stack.state.base|^] [topic.stack.desc topic.stack.desc.base|c_b][topic.stack.state topic.stack.state.base| (base)] |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
357 $ hg up s2 |
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
|
358 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
|
359 |
1910
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
360 Also test the revset: |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
361 |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
362 $ hg log -r 'stack()' |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
363 2 default {foo} draft c_c |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
364 6 default {foo} draft c_d |
1910
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
365 4 default {foo} draft c_e |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
366 5 default {foo} draft c_f |
24986e5a537c
stack: add a 'stack()' revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1909
diff
changeset
|
367 |
2681
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
368 $ 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
|
369 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
|
370 [255] |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
371 |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
372 $ 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
|
373 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
|
374 [255] |
aa4db71a6224
topics: return a parse error if stack() revset is passed with argument
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2670
diff
changeset
|
375 |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
376 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
|
377 ------------------------------------- |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
378 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
379 Make things linear again |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
380 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
381 $ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()' |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
382 rebasing 4:0f9ac936c87d "c_e" (foo) |
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
383 rebasing 5:6559e6d93aea "c_f" (foo) |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
384 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
385 o 8 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
|
386 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
387 o 7 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
|
388 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
389 @ 6 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
|
390 | |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
391 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
|
392 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
393 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
|
394 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
395 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
|
396 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
397 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
398 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
399 Create the second branch |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
400 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
401 $ 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
|
402 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
|
403 $ echo aaa > ggg |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
404 $ hg add ggg |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
405 $ 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
|
406 $ echo aaa > hhh |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
407 $ hg add hhh |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
408 $ 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
|
409 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
410 @ 10 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
|
411 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
412 o 9 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
|
413 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
414 | o 8 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
|
415 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
416 | o 7 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
|
417 |/ |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
418 o 6 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
|
419 | |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
420 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
|
421 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
422 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
|
423 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
424 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
|
425 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
426 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
427 Test output |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
428 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
429 $ hg top -l |
1998
302be26a3fd8
stack: add warning about multiple heads
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1996
diff
changeset
|
430 ### 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
|
431 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
432 s6@ c_h (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
433 s5: c_g |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
434 s2^ c_d (base) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
435 s4: c_f |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
436 s3: c_e |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
437 s2: c_d |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
438 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
439 s0^ c_b (base) |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
440 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
441 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
|
442 --------------------------------------------------------------- |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
443 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
444 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
|
445 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
446 $ 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
|
447 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
|
448 $ echo ccc > ddd |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
449 $ hg commit --amend -m 'c_D' |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
450 4 new orphan changesets |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
451 $ hg rebase -d . -s 'desc(c_g)' |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
452 rebasing 9:81264ae8a36a "c_g" (foo) |
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
453 rebasing 10:fde5f5941642 "c_h" (foo) |
1909
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
454 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
455 o 13 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
|
456 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
457 o 12 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
|
458 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
459 @ 11 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
|
460 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
461 | * 8 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
|
462 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
463 | * 7 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
|
464 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
465 | x 6 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
|
466 |/ |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
467 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
|
468 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
469 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
|
470 | |
1960
a9a1abc7dd75
test: add topic on the first 2 changesets too
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1959
diff
changeset
|
471 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
|
472 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
473 |
36112e361ee4
stack: display the base of the stack
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1906
diff
changeset
|
474 $ hg topic --list |
1998
302be26a3fd8
stack: add warning about multiple heads
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
1996
diff
changeset
|
475 ### 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
|
476 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
477 s6: c_h |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
478 s5: c_g |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
479 s2^ c_D (base current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
480 s4$ c_f (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
481 s3$ c_e (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
482 s2@ c_D (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
483 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
484 s0^ 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
|
485 |
42abd3bd30ee
topics: abort if user wants to show the stack of a non-existent topic
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2626
diff
changeset
|
486 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
|
487 $ 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
|
488 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
|
489 [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
|
490 $ 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
|
491 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
|
492 [255] |
2684
90e11985d0cc
topic: exclude public and topic changeset from branch stack
Boris Feld <boris.feld@octobus.net>
parents:
2681
diff
changeset
|
493 |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
494 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
|
495 ============================================================================== |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
496 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
497 $ hg log --graph |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
498 o 13 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
|
499 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
500 o 12 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
|
501 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
502 @ 11 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
|
503 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
504 | * 8 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
|
505 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
506 | * 7 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
|
507 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
508 | x 6 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
|
509 |/ |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
510 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
|
511 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
512 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
|
513 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
514 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
|
515 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
516 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
|
517 $ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()' |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
518 rebasing 7:215bc359096a "c_e" (foo) |
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
519 rebasing 8:ec9267b3f33f "c_f" (foo) |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
520 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
521 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
522 o 15 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
|
523 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
524 o 14 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
|
525 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
526 o 13 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
|
527 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
528 o 12 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
|
529 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
530 @ 11 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
|
531 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
532 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
|
533 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
534 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
|
535 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
536 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
|
537 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
538 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
|
539 $ 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
|
540 switching to topic foobar |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
541 4 new orphan changesets |
4268
d5a2cc19903f
topics: improve the message around topic changing
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
4067
diff
changeset
|
542 changed topic on 2 changesets to "foobar" |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
543 $ hg log -G |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
544 @ 17 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
|
545 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
546 | * 16 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
|
547 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
548 | | * 15 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
|
549 | | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
550 | | x 14 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
|
551 | |/ |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
552 | * 13 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
|
553 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
554 | * 12 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
|
555 | | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
556 | x 11 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
|
557 |/ |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
558 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
|
559 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
560 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
|
561 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
562 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
|
563 |
2927
01cf426bd458
tests: abstract version number for test-topic-stack.t
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2919
diff
changeset
|
564 $ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()' |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
565 rebasing 15:77082e55de88 "c_f" (foo) |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
566 switching to topic foo |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
567 1 new orphan changesets |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
568 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
|
569 $ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()' |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
570 rebasing 12:0c3e8aed985d "c_g" (foo) |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
571 switching to topic foo |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
572 rebasing 13:b9e4f3709bc5 "c_h" (foo) |
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
573 rebasing 16:4bc813530301 "c_e" (foobar) |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
574 switching to topic foobar |
3016
d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com>
parents:
3013
diff
changeset
|
575 rebasing 18:4406ea4be852 "c_f" (tip foo) |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
576 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
|
577 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
|
578 $ hg up |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
579 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
|
580 $ hg log --graph |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
581 o 22 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
|
582 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
583 @ 21 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
|
584 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
585 o 20 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
|
586 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
587 o 19 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
|
588 | |
3013
945a0989e41b
packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
589 o 17 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
|
590 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
591 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
|
592 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
593 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
|
594 | |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
595 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
|
596 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
597 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
|
598 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
|
599 |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
600 $ 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
|
601 ### 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
|
602 ### target: default (branch), 3 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
603 s2@ c_e (current) |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
604 ^ c_h |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
605 s1: c_D |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
606 s0^ 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
|
607 |
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
608 $ 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
|
609 ### topic: foo |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
610 ### target: default (branch), ambiguous rebase destination - topic 'foo' has 3 heads |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
611 s4: c_f |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
612 ^ c_e |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
613 s3: c_h |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
614 s2: c_g |
2913
6b2ae9f2b9c4
tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2911
diff
changeset
|
615 ^ c_D |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
616 s1: c_c |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
617 s0^ 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
|
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 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
|
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 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
622 $ cd .. |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
623 $ 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
|
624 $ 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
|
625 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
626 $ 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
|
627 $ 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
|
628 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
|
629 $ 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
|
630 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
|
631 $ 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
|
632 $ 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
|
633 adding bbb |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
634 active topic 'red' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3567
diff
changeset
|
635 (see 'hg help topics' for more information) |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
636 $ 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
|
637 $ 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
|
638 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
|
639 $ 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
|
640 $ 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
|
641 $ 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
|
642 adding ddd |
2988
62201935e1a7
topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas
parents:
2986
diff
changeset
|
643 active topic 'blue' grew its first changeset |
3769
1bc4b0807c37
topic: display a hint pointing at help when a topic becomes non-empty
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
3567
diff
changeset
|
644 (see 'hg help topics' for more information) |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
645 $ 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
|
646 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
|
647 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
|
648 $ 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
|
649 $ 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
|
650 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
|
651 $ 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
|
652 $ 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
|
653 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
|
654 $ 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
|
655 $ 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
|
656 $ 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
|
657 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
|
658 $ 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
|
659 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
|
660 $ 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
|
661 $ 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
|
662 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
|
663 (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
|
664 $ 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
|
665 $ 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
|
666 $ 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
|
667 $ 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
|
668 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
|
669 |
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 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
|
671 @ 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
|
672 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
673 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
|
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 | 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
|
676 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
677 | 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
|
678 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
679 | 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
|
680 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
681 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
|
682 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
683 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
|
684 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
685 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
|
686 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
687 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
|
688 |
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 $ 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
|
691 ### 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
|
692 ### target: default (branch), 6 behind |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
693 s5: c_H |
2918
0437158e0ed6
stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2917
diff
changeset
|
694 ^ c_G |
0437158e0ed6
stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2917
diff
changeset
|
695 ^ c_D |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
696 s4: c_C |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
697 s1^ c_B (base) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
698 s3: c_F |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
699 s2: c_E |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
700 s1: c_B |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
701 s0^ 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
|
702 $ 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
|
703 ### topic: blue |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
704 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
705 s3@ c_I (current) |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
706 ^ c_H |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
707 s2: 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
|
708 ^ c_C |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
709 s1: c_G |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
710 s0^ 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
|
711 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
712 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
|
713 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
714 (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
|
715 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
|
716 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
717 $ 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
|
718 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
|
719 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
|
720 $ hg commit --amend --user test2 |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
721 7 new orphan changesets |
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 $ 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
|
723 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
|
724 $ 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
|
725 $ 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
|
726 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
|
727 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
|
728 $ 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
|
729 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
730 $ 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
|
731 @ 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
|
732 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
733 | * 8 default {blue} draft c_I |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
734 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
735 | * 7 default {red} draft c_H |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
736 | |\ |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
737 | | * 6 default {blue} draft 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
|
738 | | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
739 | | * 5 default {red} draft c_F |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
740 | | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
741 | | * 4 default {red} draft c_E |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
742 | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
743 | 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
|
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 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
|
746 |/ |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
747 | * 10 default {red} draft c_C |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
748 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
749 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
|
750 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
751 | 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
|
752 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
753 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
|
754 |
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 $ 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
|
757 ### topic: red |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
758 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
759 s5$ c_H (unstable) |
2918
0437158e0ed6
stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2917
diff
changeset
|
760 ^ 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
|
761 ^ c_D |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
762 s4$ c_C (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
763 s1^ c_B (base) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
764 s3$ c_F (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
765 s2$ c_E (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
766 s1: c_B |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
767 s0^ 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
|
768 $ 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
|
769 ### topic: blue |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
770 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
771 s3$ c_I (unstable) |
2919
5b514ab2ab4e
stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2918
diff
changeset
|
772 ^ c_H |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
773 s2$ 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
|
774 ^ c_F |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
775 s1$ c_D (current unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
776 s0^ 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
|
777 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
778 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
|
779 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
780 $ 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
|
781 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
|
782 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
|
783 $ 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
|
784 $ 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
|
785 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
|
786 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
|
787 $ 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
|
788 $ 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
|
789 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
|
790 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
|
791 $ 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
|
792 $ 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
|
793 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
|
794 $ 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
|
795 $ 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
|
796 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
|
797 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
|
798 $ 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
|
799 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
800 $ 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
|
801 @ 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
|
802 | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
803 | * 13 default {blue} draft 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
|
804 | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
805 | | * 12 default {red} draft c_H |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
806 | | |\ |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
807 | | | | * 8 default {blue} draft c_I |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
808 | | | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
809 | | +---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
|
810 | | | |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
811 | +---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
|
812 | | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
813 | * | 5 default {red} draft c_F |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
814 | | | |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
815 | * | 4 default {red} draft c_E |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
816 | | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
817 +---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
|
818 | | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
819 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
|
820 |/ |
3417
d3a17c67f85c
branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3412
diff
changeset
|
821 | * 15 default {red} draft c_C |
2917
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
822 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
823 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
|
824 | |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
825 | 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
|
826 |/ |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
827 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
|
828 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
829 |
044686b25cf7
tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2913
diff
changeset
|
830 $ 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
|
831 ### topic: red |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
832 ### target: default (branch), ambiguous rebase destination - topic 'red' has 3 heads |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
833 s5$ c_H (unstable) |
2918
0437158e0ed6
stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2917
diff
changeset
|
834 ^ 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
|
835 ^ c_D |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
836 s4$ c_F (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
837 s3$ c_E (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
838 s1^ c_B (base) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
839 s2$ c_C (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
840 s1: c_B |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
841 s0^ 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
|
842 $ 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
|
843 ### topic: blue |
3225
28fb347a5bf8
typos: fix typos in several locations
Kyle Lippincott <spectral@google.com>
parents:
3180
diff
changeset
|
844 ### target: default (branch), ambiguous rebase destination - topic 'blue' has 3 heads |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
845 s3$ c_I (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
|
846 ^ c_H |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
847 s2$ 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
|
848 ^ c_F |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
849 s1$ c_D (current unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
850 s0^ 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
|
851 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
852 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
|
853 -------------------------------- |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
854 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
855 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
|
856 |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
857 $ hg rebase -r s1 -d default |
3018 | 858 rebasing 16:1d84ec948370 "c_D" (tip blue) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
859 switching to topic blue |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
860 $ hg rebase -r s2 -d s1 |
3018 | 861 rebasing 13:3ab2eedae500 "c_G" (blue) |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
862 $ hg rebase -r s3 -d s2 |
3018 | 863 rebasing 8:3bfe800e0486 "c_I" (blue) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
864 $ hg stack |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
865 ### topic: blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
866 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
867 s3: c_I |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
868 s2: c_G |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
869 s1@ c_D (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
870 s0^ c_A (base) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
871 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
872 making a split |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
873 (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
|
874 |
4065
fbc51e98cf13
alias: allow reference through 's#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3770
diff
changeset
|
875 $ hg up s2 |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
876 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
|
877 $ hg status --change . |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
878 A ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
879 $ echo zzz > Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
880 $ hg add Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
881 $ hg commit --amend |
3431
2e703ed1c713
evolve: update output for wider reporting of troubled changesets
Martin von Zweigbergk <martinvonz@google.com>
parents:
3417
diff
changeset
|
882 1 new orphan changesets |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
883 $ hg status --change . |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
884 A Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
885 A ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
886 $ hg stack |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
887 ### topic: blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
888 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
889 s3$ c_I (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
890 s2@ c_G (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
891 s1: c_D |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
892 s0^ c_A (base) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
893 $ hg --config extensions.evolve= --config ui.interactive=yes split << EOF |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
894 > y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
895 > y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
896 > n |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
897 > y |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
898 > EOF |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
899 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
|
900 adding Z |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
901 adding ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
902 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
|
903 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
|
904 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
|
905 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
906 @@ -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
|
907 +zzz |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
908 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
|
909 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
910 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
|
911 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
|
912 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
|
913 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
914 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
|
915 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
916 $ hg --config extensions.evolve= obslog --all |
3018 | 917 o dde94df880e9 (21) c_G |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
918 | |
3018 | 919 | @ e7ea874afbd5 (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
|
920 |/ |
3018 | 921 x b24bab30ac12 (20) c_G |
3567
5ddea3b8d2a4
split: include "operation" metadata in obsmarkers
Martin von Zweigbergk <martinvonz@google.com>
parents:
3519
diff
changeset
|
922 | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
923 | |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
924 x 907f7d3c2333 (18) c_G |
3519
2823c82ad8a4
obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents:
3431
diff
changeset
|
925 | rewritten(content) as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
926 | |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
927 x 3ab2eedae500 (13) c_G |
3519
2823c82ad8a4
obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents:
3431
diff
changeset
|
928 | rewritten(parent) as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
929 | |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
930 x c7d60a180d05 (6) c_G |
3519
2823c82ad8a4
obslog: add the operation to the Obslog output
Boris Feld <boris.feld@octobus.net>
parents:
3431
diff
changeset
|
931 rewritten(user) as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
3017
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
932 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
933 $ hg export . |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
934 # HG changeset patch |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
935 # User test3 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
936 # Date 0 0 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
937 # 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
|
938 # Node ID e7ea874afbd5c17aeee366d39a828dbcb01682ce |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
939 # Parent dde94df880e97f4a1ee8c5408254b429b3d90204 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
940 # EXP-Topic blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
941 c_G |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
942 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
943 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
|
944 --- /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
|
945 +++ 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
|
946 @@ -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
|
947 +ggg |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
948 $ hg export .^ |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
949 # HG changeset patch |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
950 # User test3 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
951 # Date 0 0 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
952 # 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
|
953 # Node ID dde94df880e97f4a1ee8c5408254b429b3d90204 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
954 # Parent f3328cd199dc389b850ca952f65a15a8e6dbc79b |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
955 # EXP-Topic blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
956 c_G |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
957 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
958 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
|
959 --- /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
|
960 +++ 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
|
961 @@ -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
|
962 +zzz |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
963 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
964 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
|
965 |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
966 $ hg stack |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
967 ### topic: blue |
0884856a4143
stack: handle basic case of splitting with crash
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
3000
diff
changeset
|
968 ### target: default (branch) |
4067
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
969 s4$ c_I (unstable) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
970 s3@ c_G (current) |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
971 s2: c_G |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
972 s1: c_D |
fb4801478d5d
stack: display 's#' instead of 't#' and 'b#'
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
4066
diff
changeset
|
973 s0^ c_A (base) |