This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9246

config: rename ui.graphnodetemplate to command-templates.graphnode
ClosedPublic

Authored by martinvonz on Oct 23 2020, 8:59 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1f7c077e0640: config: rename ui.graphnodetemplate to command-templates.graphnode

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.Oct 23 2020, 8:59 PM
martinvonz added a commit: rHG1f7c077e0640: config: rename ui.graphnodetemplate to command-templates.graphnode.Oct 28 2020, 9:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1f7c077e0640: config: rename ui.graphnodetemplate to command-templates.graphnode (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 23320

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'color', b'mode', default=b'auto', b'color', b'mode', default=b'auto',
) )
coreconfigitem( coreconfigitem(
b'color', b'pagermode', default=dynamicdefault, b'color', b'pagermode', default=dynamicdefault,
) )
coreconfigitem( coreconfigitem(
b'command-templates',
b'graphnode',
default=None,
alias=[(b'ui', b'graphnodetemplate')],
)
coreconfigitem(
b'command-templates', b'log', default=None, alias=[(b'ui', b'logtemplate')], b'command-templates', b'log', default=None, alias=[(b'ui', b'logtemplate')],
) )
_registerdiffopts(section=b'commands', configprefix=b'commit.interactive.') _registerdiffopts(section=b'commands', configprefix=b'commit.interactive.')
coreconfigitem( coreconfigitem(
b'commands', b'commit.post-status', default=False, b'commands', b'commit.post-status', default=False,
) )
coreconfigitem( coreconfigitem(
b'commands', b'grep.all-files', default=False, experimental=True, b'commands', b'grep.all-files', default=False, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'ui', b'formatjson', default=False, b'ui', b'formatjson', default=False,
) )
coreconfigitem( coreconfigitem(
b'ui', b'formatted', default=None, b'ui', b'formatted', default=None,
) )
coreconfigitem( coreconfigitem(
b'ui', b'graphnodetemplate', default=None,
)
coreconfigitem(
b'ui', b'interactive', default=None, b'ui', b'interactive', default=None,
) )
coreconfigitem( coreconfigitem(
b'ui', b'interface', default=None, b'ui', b'interface', default=None,
) )
coreconfigitem( coreconfigitem(
b'ui', b'interface.chunkselector', default=None, b'ui', b'interface.chunkselector', default=None,
) )

mercurial/helptext/config.txt

``editor`` ``editor``
The editor to use during a commit. (default: ``$EDITOR`` or ``vi``) The editor to use during a commit. (default: ``$EDITOR`` or ``vi``)
``fallbackencoding`` ``fallbackencoding``
Encoding to try if it's not possible to decode the changelog using Encoding to try if it's not possible to decode the changelog using
UTF-8. (default: ISO-8859-1) UTF-8. (default: ISO-8859-1)
``graphnodetemplate`` ``graphnodetemplate``
The template used to print changeset nodes in an ASCII revision graph. (DEPRECATED) Use ``command-templates.graphnode`` instead.
(default: ``{graphnode}``)
``ignore`` ``ignore``
A file to read per-user ignore patterns from. This file should be A file to read per-user ignore patterns from. This file should be
in the same format as a repository-wide .hgignore file. Filenames in the same format as a repository-wide .hgignore file. Filenames
are relative to the repository root. This option supports hook syntax, are relative to the repository root. This option supports hook syntax,
so if you want to specify multiple ignore files, you can do so by so if you want to specify multiple ignore files, you can do so by
setting something like ``ignore.other = ~/.hgignore2``. For details setting something like ``ignore.other = ~/.hgignore2``. For details
of the ignore file format, see the ``hgignore(5)`` man page. of the ignore file format, see the ``hgignore(5)`` man page.
Increase the amount of output printed. (default: False) Increase the amount of output printed. (default: False)
``command-templates`` ``command-templates``
--------------------- ---------------------
Templates used for customizing the output of commands. Templates used for customizing the output of commands.
``graphnode``
The template used to print changeset nodes in an ASCII revision graph.
(default: ``{graphnode}``)
``log`` ``log``
Template string for commands that print changesets. Template string for commands that print changesets.
``web`` ``web``
------- -------
Web interface configuration. The settings in this section apply to Web interface configuration. The settings in this section apply to

mercurial/logcmdutil.py

differ = changesetdiffer() differ = changesetdiffer()
differ._makefilematcher = filematcher differ._makefilematcher = filematcher
differ._makehunksfilter = hunksfilter differ._makehunksfilter = hunksfilter
return smartset.baseset(revs), differ return smartset.baseset(revs), differ
def _graphnodeformatter(ui, displayer): def _graphnodeformatter(ui, displayer):
spec = ui.config(b'ui', b'graphnodetemplate') spec = ui.config(b'command-templates', b'graphnode')
if not spec: if not spec:
return templatekw.getgraphnode # fast path for "{graphnode}" return templatekw.getgraphnode # fast path for "{graphnode}"
spec = templater.unquotestring(spec) spec = templater.unquotestring(spec)
if isinstance(displayer, changesettemplater): if isinstance(displayer, changesettemplater):
# reuse cache of slow templates # reuse cache of slow templates
tres = displayer._tresources tres = displayer._tresources
else: else:

tests/test-glog-beautifygraph.t

\xe2\x97\x8b 2147483647:ffffffffffff (esc) \xe2\x97\x8b 2147483647:ffffffffffff (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x97\x8d 3:5918b8d165d1 (esc) \xe2\x97\x8d 3:5918b8d165d1 (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x95\xa7 (esc) \xe2\x95\xa7 (esc)
node template with changesetprinter: node template with changesetprinter:
$ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"' $ hg log -Gqr 5:7 --config command-templates.graphnode='"{rev}"'
7 7:9febbb9c8b2e 7 7:9febbb9c8b2e
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
6 6:9feeac35a70a 6 6:9feeac35a70a
\xe2\x94\x82\xe2\x95\xb2 (esc) \xe2\x94\x82\xe2\x95\xb2 (esc)
\xe2\x94\x82 \xe2\x95\xa7 (esc) \xe2\x94\x82 \xe2\x95\xa7 (esc)
5 5:99b31f1c2782 5 5:99b31f1c2782
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x95\xa7 (esc) \xe2\x95\xa7 (esc)
node template with changesettemplater (shared cache variable): node template with changesettemplater (shared cache variable):
$ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \ $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
> --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}' > --config command-templates.graphnode='{ifeq(latesttagdistance, 0, "#", graphnode)}'
\xe2\x97\x8b 7 foo-bar+1 (esc) \xe2\x97\x8b 7 foo-bar+1 (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
# 6 foo-bar+0 # 6 foo-bar+0
\xe2\x94\x82\xe2\x95\xb2 (esc) \xe2\x94\x82\xe2\x95\xb2 (esc)
\xe2\x94\x82 \xe2\x95\xa7 (esc) \xe2\x94\x82 \xe2\x95\xa7 (esc)
\xe2\x97\x8b 5 null+5 (esc) \xe2\x97\x8b 5 null+5 (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x95\xa7 (esc) \xe2\x95\xa7 (esc)
label() should just work in node template: label() should just work in node template:
$ hg log -Gqr 7 --config extensions.color= --color=debug \ $ hg log -Gqr 7 --config extensions.color= --color=debug \
> --config ui.graphnodetemplate='{label("branch.{branch}", rev)}' > --config command-templates.graphnode='{label("branch.{branch}", rev)}'
[branch.default\xe2\x94\x827] [log.node|7:9febbb9c8b2e] (esc) [branch.default\xe2\x94\x827] [log.node|7:9febbb9c8b2e] (esc)
\xe2\x94\x82 (esc) \xe2\x94\x82 (esc)
\xe2\x95\xa7 (esc) \xe2\x95\xa7 (esc)
$ cd .. $ cd ..
change graph edge styling change graph edge styling

tests/test-glog.t

o 2147483647:ffffffffffff o 2147483647:ffffffffffff
| |
@ 3:5918b8d165d1 @ 3:5918b8d165d1
| |
~ ~
node template with changesetprinter: node template with changesetprinter:
$ hg log -Gqr 5:7 --config command-templates.graphnode='"{rev}"'
7 7:9febbb9c8b2e
|
6 6:9feeac35a70a
|\
| ~
5 5:99b31f1c2782
|
~
node template with changesetprinter (legacy config):
$ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"' $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"'
7 7:9febbb9c8b2e 7 7:9febbb9c8b2e
| |
6 6:9feeac35a70a 6 6:9feeac35a70a
|\ |\
| ~ | ~
5 5:99b31f1c2782 5 5:99b31f1c2782
| |
~ ~
node template with changesettemplater (shared cache variable): node template with changesettemplater (shared cache variable):
$ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \ $ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \
> --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}' > --config command-templates.graphnode='{ifeq(latesttagdistance, 0, "#", graphnode)}'
o 7 foo-bar+1 o 7 foo-bar+1
| |
# 6 foo-bar+0 # 6 foo-bar+0
|\ |\
| ~ | ~
o 5 null+5 o 5 null+5
| |
~ ~
label() should just work in node template: label() should just work in node template:
$ hg log -Gqr 7 --config extensions.color= --color=debug \ $ hg log -Gqr 7 --config extensions.color= --color=debug \
> --config ui.graphnodetemplate='{label("branch.{branch}", rev)}' > --config command-templates.graphnode='{label("branch.{branch}", rev)}'
[branch.default|7] [log.node|7:9febbb9c8b2e] [branch.default|7] [log.node|7:9febbb9c8b2e]
| |
~ ~
$ cd .. $ cd ..
change graph edge styling change graph edge styling