This is an archive of the discontinued Mercurial Phabricator instance.

Differential D237

template: rename troubles templatekw into instabilities
ClosedPublic

Authored by lothiraldan on Aug 7 2017, 6:07 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG511d6ae462f3: template: rename troubles templatekw into instabilities
Summary

Rename troubles template keyword into instabilities and add a deprecation
warning on templatekw.

Update default mapfile and test files to use the new template keyword.

The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.

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

lothiraldan created this revision.Aug 7 2017, 6:07 AM
indygreg accepted this revision.Aug 8 2017, 12:34 AM
This revision is now accepted and ready to land.Aug 8 2017, 12:34 AM
Closed by commit rHG511d6ae462f3: template: rename troubles templatekw into instabilities (authored by lothiraldan). · Explain WhyAug 8 2017, 4:38 PM
This revision was automatically updated to reflect the committed changes.
lothiraldan updated this revision to Diff 663.Aug 9 2017, 2:06 AM

Revision Contents
Changeset List

Diff 653

mercurial/templatekw.py

keywords[name] = func keywords[name] = func
@templatekeyword('termwidth') @templatekeyword('termwidth')
def termwidth(repo, ctx, templ, **args): def termwidth(repo, ctx, templ, **args):
"""Integer. The width of the current terminal.""" """Integer. The width of the current terminal."""
return repo.ui.termwidth() return repo.ui.termwidth()
@templatekeyword('troubles') @templatekeyword('troubles')
def showtroubles(**args): def showtroubles(repo, **args):
"""List of strings. Evolution troubles affecting the changeset. """List of strings. Evolution troubles affecting the changeset.
(DEPRECATED)
"""
msg = ("'troubles' is deprecated, "
"use 'instabilities'")
repo.ui.deprecwarn(msg, '4.4')
return showinstabilities(repo=repo, **args)
@templatekeyword('instabilities')
def showinstabilities(**args):
"""List of strings. Evolution instabilities affecting the changeset.
(EXPERIMENTAL) (EXPERIMENTAL)
""" """
args = pycompat.byteskwargs(args) args = pycompat.byteskwargs(args)
return showlist('trouble', args['ctx'].troubles(), args) return showlist('trouble', args['ctx'].troubles(), args)
# tell hggettext to extract docstrings from these functions: # tell hggettext to extract docstrings from these functions:
i18nfunctions = keywords.values() i18nfunctions = keywords.values()

mercurial/templates/map-cmdline.default

lfile_copies_switch = '{if(file_copies_switch, lfile_copies_switch = '{if(file_copies_switch,
label("ui.note log.copies", label("ui.note log.copies",
"copies: {file_copies_switch "copies: {file_copies_switch
% ' {name} ({source})'}\n"))}' % ' {name} ({source})'}\n"))}'
# General templates # General templates
_trouble_label = 'trouble.{trouble}' _trouble_label = 'trouble.{trouble}'
_troubles_labels = '{if(troubles, "changeset.troubled {troubles%_trouble_label}")}' _troubles_labels = '{if(instabilities, "changeset.troubled {instabilities%_trouble_label}")}'
_obsolete_label = '{if(obsolete, "changeset.obsolete")}' _obsolete_label = '{if(obsolete, "changeset.obsolete")}'
_cset_labels = '{separate(" ", "log.changeset", "changeset.{phase}", "{_obsolete_label}", "{_troubles_labels}")}' _cset_labels = '{separate(" ", "log.changeset", "changeset.{phase}", "{_obsolete_label}", "{_troubles_labels}")}'
cset = '{label("{_cset_labels}", cset = '{label("{_cset_labels}",
"changeset: {rev}:{node|short}")}\n' "changeset: {rev}:{node|short}")}\n'
lphase = '{label("log.phase", lphase = '{label("log.phase",
"phase: {phase}")}\n' "phase: {phase}")}\n'
"user: {author}")}\n' "user: {author}")}\n'
summary = '{if(desc|strip, "{label('log.summary', summary = '{if(desc|strip, "{label('log.summary',
'summary: {desc|firstline}')}\n")}' 'summary: {desc|firstline}')}\n")}'
ldate = '{label("log.date", ldate = '{label("log.date",
"date: {date|date}")}\n' "date: {date|date}")}\n'
ltroubles = '{if(troubles, "{label('log.trouble', ltroubles = '{if(instabilities, "{label('log.trouble',
'trouble: {join(troubles, ", ")}')}\n")}' 'instability: {join(instabilities, ", ")}')}\n")}'
extra = '{label("ui.debug log.extra", extra = '{label("ui.debug log.extra",
"extra: {key}={value|stringescape}")}\n' "extra: {key}={value|stringescape}")}\n'
description = '{if(desc|strip, "{label('ui.note log.description', description = '{if(desc|strip, "{label('ui.note log.description',
'description:')} 'description:')}
{label('ui.note log.description', {label('ui.note log.description',
'{desc|strip}')}\n\n")}' '{desc|strip}')}\n\n")}'
status = '{status} {path}\n{if(copy, " {copy}\n")}' status = '{status} {path}\n{if(copy, " {copy}\n")}'

tests/test-obsolete-divergent.t

> with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): > with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'):
> mapping = {node('desc(B1)'): [node('desc(B3)')], > mapping = {node('desc(B1)'): [node('desc(B3)')],
> node('desc(B3)'): [node('desc(B4)')]} > node('desc(B3)'): [node('desc(B4)')]}
> scmutil.cleanupnodes(repo, mapping, 'test') > scmutil.cleanupnodes(repo, mapping, 'test')
> EOF > EOF
$ rm .hg/localtags $ rm .hg/localtags
$ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
$ hg log -G -T '{rev}:{node|short} {desc} {troubles}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
@ 5:1a2a9b5b0030 B2 content-divergent @ 5:1a2a9b5b0030 B2 content-divergent
| |
| o 4:70d5a63ca112 B4 content-divergent | o 4:70d5a63ca112 B4 content-divergent
| | | |
| o 1:48b9aae0607f Z | o 1:48b9aae0607f Z
| |
o 0:426bada5c675 A o 0:426bada5c675 A
$ hg debugobsolete $ hg debugobsolete
a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a178212c3433c4e77b573f6011e29affb8aefa33 1a2a9b5b0030632400aa78e00388c20f99d3ec44 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} a178212c3433c4e77b573f6011e29affb8aefa33 ad6478fb94ecec98b86daae98722865d494ac561 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} ad6478fb94ecec98b86daae98722865d494ac561 70d5a63ca112acb3764bc1d7320ca90ea688d671 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

tests/test-obsolete.t

$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [phases] > [phases]
> # public changeset are not obsolete > # public changeset are not obsolete
> publish=false > publish=false
> [ui] > [ui]
> logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(troubles, ' {troubles}')}) [{tags} {bookmarks}] {desc|firstline}\n" > logtemplate="{rev}:{node|short} ({phase}{if(obsolete, ' *{obsolete}*')}{if(instabilities, ' {instabilities}')}) [{tags} {bookmarks}] {desc|firstline}\n"
> EOF > EOF
$ mkcommit() { $ mkcommit() {
> echo "$1" > "$1" > echo "$1" > "$1"
> hg add "$1" > hg add "$1"
> hg ci -m "add $1" > hg ci -m "add $1"
> } > }
$ getid() { $ getid() {
> hg log -T "{node}\n" --hidden -r "desc('$1')" > hg log -T "{node}\n" --hidden -r "desc('$1')"
7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar 7:50c51b361e60 (draft orphan phase-divergent) [ ] add babar
test the default cmdline template test the default cmdline template
$ hg log -T default -r 'bumped()' $ hg log -T default -r 'bumped()'
changeset: 7:50c51b361e60 changeset: 7:50c51b361e60
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
trouble: orphan, phase-divergent instability: orphan, phase-divergent
summary: add babar summary: add babar
$ hg log -T default -r 'obsolete()' $ hg log -T default -r 'obsolete()'
changeset: 6:3de5eca88c00 changeset: 6:3de5eca88c00
parent: 3:6f9641995072 parent: 3:6f9641995072
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: add obsolete_e summary: add obsolete_e

tests/test-template-engine.t

$ cat > engine.py << EOF $ cat > engine.py << EOF
> >
> from mercurial import templater > from mercurial import templater
> >
> class mytemplater(object): > class mytemplater(object):
> def __init__(self, loader, filters, defaults, aliases): > def __init__(self, loader, filters, defaults, aliases):
> self.loader = loader > self.loader = loader
> >
> def process(self, t, map): > def process(self, t, map):
> tmpl = self.loader(t) > tmpl = self.loader(t)
> for k, v in map.iteritems(): > for k, v in map.iteritems():
> if k in ('templ', 'ctx', 'repo', 'revcache', 'cache'): > if k in ('templ', 'ctx', 'repo', 'revcache', 'cache', 'troubles'):
> continue > continue
> if hasattr(v, '__call__'): > if hasattr(v, '__call__'):
> v = v(**map) > v = v(**map)
> v = templater.stringify(v) > v = templater.stringify(v)
> tmpl = tmpl.replace('{{%s}}' % k, v) > tmpl = tmpl.replace('{{%s}}' % k, v)
> yield tmpl > yield tmpl
> >
> templater.engines['my'] = mytemplater > templater.engines['my'] = mytemplater