comparison tests/test-url-rev.t @ 25382:6084926366b9

summary: move the parents phase marker to commit line (issue4688) The phase of the pending commit depends on the parent of the working directory and on the phases.newcommit configuration. First, this information rather depend on the commit line which describe the pending commit. Then, we only want to be advertised when the pending phase is going to be higher than the default new commit phase. So the format will change from $ hg summary parent: 2:ab91dfabc5ad foo parent: 3:24f1031ad244 tip bar branch: default commit: 1 modified, 1 unknown, 1 unresolved (merge) update: (current) phases: 1 secret (secret) to parent: 2:ab91dfabc5ad foo parent: 3:24f1031ad244 tip bar branch: default commit: 1 modified, 1 unknown, 1 unresolved (merge) (secret) update: (current) phases: 1 secret
author Gilles Moris <gilles.moris@free.fr>
date Fri, 29 May 2015 22:23:58 +0200
parents 1ef96a3b8b89
children 3d2ea1403c62
comparison
equal deleted inserted replaced
25381:47edeff19139 25382:6084926366b9
99 parent: 3:4cd725637392 tip 99 parent: 3:4cd725637392 tip
100 add bar 100 add bar
101 branch: default 101 branch: default
102 commit: (clean) 102 commit: (clean)
103 update: (current) 103 update: (current)
104 phases: 4 draft (draft) 104 phases: 4 draft
105 remote: 2 outgoing 105 remote: 2 outgoing
106 $ hg -q outgoing '../clone#foo' 106 $ hg -q outgoing '../clone#foo'
107 2:faba9097cad4 107 2:faba9097cad4
108 $ hg summary --remote --config paths.default='../clone#foo' 108 $ hg summary --remote --config paths.default='../clone#foo'
109 parent: 3:4cd725637392 tip 109 parent: 3:4cd725637392 tip
110 add bar 110 add bar
111 branch: default 111 branch: default
112 commit: (clean) 112 commit: (clean)
113 update: (current) 113 update: (current)
114 phases: 4 draft (draft) 114 phases: 4 draft
115 remote: 1 outgoing 115 remote: 1 outgoing
116 116
117 $ hg -q --cwd ../clone incoming '../repo#foo' 117 $ hg -q --cwd ../clone incoming '../repo#foo'
118 2:faba9097cad4 118 2:faba9097cad4
119 $ hg --cwd ../clone summary --remote --config paths.default='../repo#foo' 119 $ hg --cwd ../clone summary --remote --config paths.default='../repo#foo'
282 parent: 4:d515801a8f3d tip 282 parent: 4:d515801a8f3d tip
283 new head to push current default head 283 new head to push current default head
284 branch: default 284 branch: default
285 commit: (clean) 285 commit: (clean)
286 update: (current) 286 update: (current)
287 phases: 1 draft (draft) 287 phases: 1 draft
288 remote: 1 outgoing 288 remote: 1 outgoing
289 289
290 $ hg summary --remote --config paths.default='../clone#foo' --config paths.default-push='../clone' 290 $ hg summary --remote --config paths.default='../clone#foo' --config paths.default-push='../clone'
291 parent: 4:d515801a8f3d tip 291 parent: 4:d515801a8f3d tip
292 new head to push current default head 292 new head to push current default head
293 branch: default 293 branch: default
294 commit: (clean) 294 commit: (clean)
295 update: (current) 295 update: (current)
296 phases: 1 draft (draft) 296 phases: 1 draft
297 remote: 2 outgoing 297 remote: 2 outgoing
298 298
299 $ hg summary --remote --config paths.default='../clone' --config paths.default-push='../clone#foo' 299 $ hg summary --remote --config paths.default='../clone' --config paths.default-push='../clone#foo'
300 parent: 4:d515801a8f3d tip 300 parent: 4:d515801a8f3d tip
301 new head to push current default head 301 new head to push current default head
302 branch: default 302 branch: default
303 commit: (clean) 303 commit: (clean)
304 update: (current) 304 update: (current)
305 phases: 1 draft (draft) 305 phases: 1 draft
306 remote: 1 outgoing 306 remote: 1 outgoing
307 307
308 $ hg clone -q -r 0 . ../another 308 $ hg clone -q -r 0 . ../another
309 $ hg -q outgoing '../another#default' 309 $ hg -q outgoing '../another#default'
310 3:4cd725637392 310 3:4cd725637392
314 parent: 4:d515801a8f3d tip 314 parent: 4:d515801a8f3d tip
315 new head to push current default head 315 new head to push current default head
316 branch: default 316 branch: default
317 commit: (clean) 317 commit: (clean)
318 update: (current) 318 update: (current)
319 phases: 1 draft (draft) 319 phases: 1 draft
320 remote: 1 outgoing 320 remote: 1 outgoing
321 321
322 $ cd .. 322 $ cd ..