This is an archive of the discontinued Mercurial Phabricator instance.

Differential D257

label: rename changeset.troubled into changeset.unstable
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3821dfee2cfc: label: rename changeset.troubled into changeset.unstable
Summary

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:11 AM
Closed by commit rHG3821dfee2cfc: label: rename changeset.troubled into changeset.unstable (authored by lothiraldan). · Explain WhyAug 11 2017, 4:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 811

mercurial/cmdutil.py

sub.diff(ui, diffopts, tempnode2, submatch, changes=changes, sub.diff(ui, diffopts, tempnode2, submatch, changes=changes,
stat=stat, fp=fp, prefix=prefix) stat=stat, fp=fp, prefix=prefix)
def _changesetlabels(ctx): def _changesetlabels(ctx):
labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()] labels = ['log.changeset', 'changeset.%s' % ctx.phasestr()]
if ctx.obsolete(): if ctx.obsolete():
labels.append('changeset.obsolete') labels.append('changeset.obsolete')
if ctx.isunstable(): if ctx.isunstable():
labels.append('changeset.troubled') labels.append('changeset.unstable')
for instability in ctx.instabilities(): for instability in ctx.instabilities():
labels.append('trouble.%s' % instability) labels.append('trouble.%s' % instability)
return ' '.join(labels) return ' '.join(labels)
class changeset_printer(object): class changeset_printer(object):
'''show changeset information when templating not requested.''' '''show changeset information when templating not requested.'''
def __init__(self, ui, repo, matchfn, diffopts, buffered): def __init__(self, ui, repo, matchfn, diffopts, buffered):

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(instabilities, "changeset.troubled {instabilities%_trouble_label}")}' _troubles_labels = '{if(instabilities, "changeset.unstable {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'

tests/test-obsolete.t

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
test the obsolete labels test the obsolete labels
$ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()' $ hg log --config ui.logtemplate= --color=debug -r 'phasedivergent()'
[log.changeset changeset.draft changeset.troubled trouble.orphan trouble.phase-divergent|changeset: 7:50c51b361e60] [log.changeset changeset.draft changeset.unstable trouble.orphan trouble.phase-divergent|changeset: 7:50c51b361e60]
[log.user|user: test] [log.user|user: test]
[log.date|date: Thu Jan 01 00:00:00 1970 +0000] [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
[log.trouble|instability: orphan, phase-divergent] [log.trouble|instability: orphan, phase-divergent]
[log.summary|summary: add babar] [log.summary|summary: add babar]
$ hg log -T default -r 'phasedivergent()' --color=debug $ hg log -T default -r 'phasedivergent()' --color=debug
[log.changeset changeset.draft changeset.troubled trouble.orphantrouble.phase-divergent|changeset: 7:50c51b361e60] [log.changeset changeset.draft changeset.unstable trouble.orphantrouble.phase-divergent|changeset: 7:50c51b361e60]
[log.user|user: test] [log.user|user: test]
[log.date|date: Thu Jan 01 00:00:00 1970 +0000] [log.date|date: Thu Jan 01 00:00:00 1970 +0000]
[log.trouble|instability: orphan, phase-divergent] [log.trouble|instability: orphan, phase-divergent]
[log.summary|summary: add babar] [log.summary|summary: add babar]
$ hg log --config ui.logtemplate= --color=debug -r "obsolete()" $ hg log --config ui.logtemplate= --color=debug -r "obsolete()"
[log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00] [log.changeset changeset.draft changeset.obsolete|changeset: 6:3de5eca88c00]