comparison tests/test-phases.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 a7701001c829
children 6afd8a87a657
comparison
equal deleted inserted replaced
25381:47edeff19139 25382:6084926366b9
252 $ hg summary -R clone-dest --verbose 252 $ hg summary -R clone-dest --verbose
253 parent: -1:000000000000 (no revision checked out) 253 parent: -1:000000000000 (no revision checked out)
254 branch: default 254 branch: default
255 commit: (clean) 255 commit: (clean)
256 update: 5 new changesets (update) 256 update: 5 new changesets (update)
257 phases: (public)
258 $ hg summary -R initialrepo 257 $ hg summary -R initialrepo
259 parent: 7:17a481b3bccb tip 258 parent: 7:17a481b3bccb tip
260 merge B' and E 259 merge B' and E
261 branch: default 260 branch: default
262 commit: (clean) 261 commit: (clean) (secret)
263 update: 1 new changesets, 2 branch heads (merge) 262 update: 1 new changesets, 2 branch heads (merge)
264 phases: 3 draft, 3 secret (secret) 263 phases: 3 draft, 3 secret
265 $ hg summary -R initialrepo --quiet 264 $ hg summary -R initialrepo --quiet
266 parent: 7:17a481b3bccb tip 265 parent: 7:17a481b3bccb tip
267 update: 1 new changesets, 2 branch heads (merge) 266 update: 1 new changesets, 2 branch heads (merge)
268 267
269 Test revset 268 Test revset