Mercurial > evolve

comparison tests/test-stack-branch.t @ 4067:fb4801478d5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stack: display 's#' instead of 't#' and 'b#' If we want people to use it, we should display it.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 Sep 2018 17:07:36 +0200
parents 1aa5f851d2c0
children f9a850018daa d5a2cc19903f
comparison
equal deleted inserted replaced
4066:1aa5f851d2c0 4067:fb4801478d5d
54 54
55 $ hg up other 55 $ hg up other
56 0 files updated, 0 files merged, 4 files removed, 0 files unresolved 56 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
57 $ hg stack 57 $ hg stack
58 ### target: other (branch) 58 ### target: other (branch)
59 b2@ c_b (current) 59 s2@ c_b (current)
60 b1: c_a 60 s1: c_a
61 $ hg phase --public 'branch("other")' 61 $ hg phase --public 'branch("other")'
62 $ hg up foo 62 $ hg up foo
63 4 files updated, 0 files merged, 0 files removed, 0 files unresolved 63 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
64 64
65 Simple test 65 Simple test
69 69
70 $ hg branch 70 $ hg branch
71 foo 71 foo
72 $ hg stack 72 $ hg stack
73 ### target: foo (branch) 73 ### target: foo (branch)
74 b4@ c_f (current) 74 s4@ c_f (current)
75 b3: c_e 75 s3: c_e
76 b2: c_d 76 s2: c_d
77 b1: c_c 77 s1: c_c
78 b0^ c_b (base) 78 s0^ c_b (base)
79 $ hg stack -v 79 $ hg stack -v
80 ### target: foo (branch) 80 ### target: foo (branch)
81 b4(913c298d8b0a)@ c_f (current) 81 s4(913c298d8b0a)@ c_f (current)
82 b3(4f2a69f6d380): c_e 82 s3(4f2a69f6d380): c_e
83 b2(f61adbacd17a): c_d 83 s2(f61adbacd17a): c_d
84 b1(3e9313bc4b71): c_c 84 s1(3e9313bc4b71): c_c
85 b0(4a04f1104a27)^ c_b (base) 85 s0(4a04f1104a27)^ c_b (base)
86 86
87 Test "t#" reference 87 Test "t#" reference
88 ------------------- 88 -------------------
89 89
90 $ hg up b2 90 $ hg up b2
125 | 125 |
126 o 0 other {} public c_a 126 o 0 other {} public c_a
127 127
128 $ hg stack 128 $ hg stack
129 ### target: foo (branch) 129 ### target: foo (branch)
130 b4$ c_f (unstable) 130 s4$ c_f (unstable)
131 b3$ c_e (unstable) 131 s3$ c_e (unstable)
132 b2@ c_d (current) 132 s2@ c_d (current)
133 b1: c_c 133 s1: c_c
134 b0^ c_b (base) 134 s0^ c_b (base)
135 $ hg up b3 135 $ hg up b3
136 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 136 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
137 $ hg stack 137 $ hg stack
138 ### target: foo (branch) 138 ### target: foo (branch)
139 b4$ c_f (unstable) 139 s4$ c_f (unstable)
140 b3$ c_e (current unstable) 140 s3$ c_e (current unstable)
141 b2: c_d 141 s2: c_d
142 b1: c_c 142 s1: c_c
143 b0^ c_b (base) 143 s0^ c_b (base)
144 $ hg up b2 144 $ hg up b2
145 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 145 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
146 146
147 Also test the revset: 147 Also test the revset:
148 148
206 206
207 Test output 207 Test output
208 208
209 $ hg stack 209 $ hg stack
210 ### target: foo (branch) (2 heads) 210 ### target: foo (branch) (2 heads)
211 b6@ c_h (current) 211 s6@ c_h (current)
212 b5: c_g 212 s5: c_g
213 b2^ c_d (base) 213 s2^ c_d (base)
214 b4: c_f 214 s4: c_f
215 b3: c_e 215 s3: c_e
216 b2: c_d 216 s2: c_d
217 b1: c_c 217 s1: c_c
218 b0^ c_b (base) 218 s0^ c_b (base)
219 219
220 Case with multiple heads on the topic with unstability involved 220 Case with multiple heads on the topic with unstability involved
221 --------------------------------------------------------------- 221 ---------------------------------------------------------------
222 222
223 We amend the message to make sure the display base pick the right changeset 223 We amend the message to make sure the display base pick the right changeset
250 o 0 other {} public c_a 250 o 0 other {} public c_a
251 251
252 252
253 $ hg stack 253 $ hg stack
254 ### target: foo (branch) (2 heads) 254 ### target: foo (branch) (2 heads)
255 b6: c_h 255 s6: c_h
256 b5: c_g 256 s5: c_g
257 b2^ c_D (base current) 257 s2^ c_D (base current)
258 b4$ c_f (unstable) 258 s4$ c_f (unstable)
259 b3$ c_e (unstable) 259 s3$ c_e (unstable)
260 b2@ c_D (current) 260 s2@ c_D (current)
261 b1: c_c 261 s1: c_c
262 b0^ c_b (base) 262 s0^ c_b (base)
263 263
264 Check that stack doesn't show draft changesets on a branch 264 Check that stack doesn't show draft changesets on a branch
265 ---------------------------------------------------------- 265 ----------------------------------------------------------
266 266
267 $ hg log --graph 267 $ hg log --graph
284 o 0 other {} public c_a 284 o 0 other {} public c_a
285 285
286 286
287 $ hg stack 287 $ hg stack
288 ### target: foo (branch) (2 heads) 288 ### target: foo (branch) (2 heads)
289 b6: c_h 289 s6: c_h
290 b5: c_g 290 s5: c_g
291 b2^ c_D (base current) 291 s2^ c_D (base current)
292 b4$ c_f (unstable) 292 s4$ c_f (unstable)
293 b3$ c_e (unstable) 293 s3$ c_e (unstable)
294 b2@ c_D (current) 294 s2@ c_D (current)
295 b1: c_c 295 s1: c_c
296 b0^ c_b (base) 296 s0^ c_b (base)
297 $ hg phase --public b1 297 $ hg phase --public b1
298 $ hg stack 298 $ hg stack
299 ### target: foo (branch) (2 heads) 299 ### target: foo (branch) (2 heads)
300 b5: c_h 300 s5: c_h
301 b4: c_g 301 s4: c_g
302 b1^ c_D (base current) 302 s1^ c_D (base current)
303 b3$ c_f (unstable) 303 s3$ c_f (unstable)
304 b2$ c_e (unstable) 304 s2$ c_e (unstable)
305 b1@ c_D (current) 305 s1@ c_D (current)
306 b0^ c_c (base) 306 s0^ c_c (base)
307 307
308 Check that stack doesn't show changeset with a topic 308 Check that stack doesn't show changeset with a topic
309 ---------------------------------------------------- 309 ----------------------------------------------------
310 310
311 $ hg topic --rev b4::b5 sometopic 311 $ hg topic --rev b4::b5 sometopic
312 changed topic on 2 changes 312 changed topic on 2 changes
313 $ hg stack 313 $ hg stack
314 ### target: foo (branch) 314 ### target: foo (branch)
315 b3$ c_f (unstable) 315 s3$ c_f (unstable)
316 b2$ c_e (unstable) 316 s2$ c_e (unstable)
317 b1@ c_D (current) 317 s1@ c_D (current)
318 b0^ c_c (base) 318 s0^ c_c (base)