This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8649

help: document meaning of '%' in graphlog output
ClosedPublic

Authored by martinvonz on Jun 23 2020, 1:20 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3d41172f2ac9: help: document meaning of '%' in graphlog output
Summary

I added the feature in 14d0e89520a2 (graphlog: use '%' for other
context in merge conflict, 2020-01-28), but I didn't think to look for
documentation until today (because an internal user asked about it).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 23 2020, 1:20 AM
pulkit accepted this revision.Jun 23 2020, 4:57 AM
This revision is now accepted and ready to land.Jun 23 2020, 4:57 AM
martinvonz added a commit: rHG3d41172f2ac9: help: document meaning of '%' in graphlog output.Jun 23 2020, 6:13 AM
Closed by commit rHG3d41172f2ac9: help: document meaning of '%' in graphlog output (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (3 lines)

Diff 21688

mercurial/commands.py

By default this command prints revision number and changeset id, By default this command prints revision number and changeset id,
tags, non-trivial parents, user, date and time, and a summary for tags, non-trivial parents, user, date and time, and a summary for
each commit. When the -v/--verbose switch is used, the list of each commit. When the -v/--verbose switch is used, the list of
changed files and full commit message are shown. changed files and full commit message are shown.
With --graph the revisions are shown as an ASCII art DAG with the most With --graph the revisions are shown as an ASCII art DAG with the most
recent changeset at the top. recent changeset at the top.
'o' is a changeset, '@' is a working directory parent, '_' closes a branch, 'o' is a changeset, '@' is a working directory parent, '%' is a changeset
involved in an unresolved merge conflict, '_' closes a branch,
'x' is obsolete, '*' is unstable, and '+' represents a fork where the 'x' is obsolete, '*' is unstable, and '+' represents a fork where the
changeset from the lines below is a parent of the 'o' merge on the same changeset from the lines below is a parent of the 'o' merge on the same
line. line.
Paths in the DAG are represented with '|', '/' and so forth. ':' in place Paths in the DAG are represented with '|', '/' and so forth. ':' in place
of a '|' indicates one or more revisions in a path are omitted. of a '|' indicates one or more revisions in a path are omitted.
.. container:: verbose .. container:: verbose