Mercurial > hg
comparison tests/test-merge1.t @ 25111:1ef96a3b8b89
summary: add a phase line (draft, secret) to the output
The number of draft and secret changesets are currently not summarized.
This is an important information because the number of drafts give some rough
idea of the number of outgoing changesets in typical workflows, without needing
to probe a remote repository. And a non-zero number of secrets means that
those changeset will not be pushed.
If the repository is "dirty" - some draft or secret changesets exists - then
summary will display a line like:
phases: X draft, Y secret (public)
The phase in parenthesis corresponds to the highest phase of the parents of
the working directory, i.e. the current phase.
By default, the line is not printed if the repository is "clean" - all
changesets are public - but if verbose is activated, it will display:
phases: (public)
On the other hand, nothing will be printed if quiet is in action.
A few tests have been added in test-phases.t to cover the -v and -q cases.
| author | Gilles Moris <gilles.moris@free.fr> |
|---|---|
| date | Thu, 14 May 2015 17:38:38 +0200 |
| parents | 94c394653b2a |
| children | 6084926366b9 |
comparison
equal
deleted
inserted
replaced
| 25110:c9f382c8233a | 25111:1ef96a3b8b89 |
|---|---|
| 38 parent: 0:538afb845929 | 38 parent: 0:538afb845929 |
| 39 commit #0 | 39 commit #0 |
| 40 branch: default | 40 branch: default |
| 41 commit: (interrupted update) | 41 commit: (interrupted update) |
| 42 update: 1 new changesets (update) | 42 update: 1 new changesets (update) |
| 43 phases: 2 draft (draft) | |
| 43 $ rmdir b | 44 $ rmdir b |
| 44 $ hg up | 45 $ hg up |
| 45 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 46 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 46 $ hg sum | 47 $ hg sum |
| 47 parent: 1:b8bb4a988f25 tip | 48 parent: 1:b8bb4a988f25 tip |
| 48 commit #1 | 49 commit #1 |
| 49 branch: default | 50 branch: default |
| 50 commit: (clean) | 51 commit: (clean) |
| 51 update: (current) | 52 update: (current) |
| 53 phases: 2 draft (draft) | |
| 52 | 54 |
| 53 Prepare a basic merge | 55 Prepare a basic merge |
| 54 | 56 |
| 55 $ hg up 0 | 57 $ hg up 0 |
| 56 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 58 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |