This is an archive of the discontinued Mercurial Phabricator instance.

Differential D259

label: rename log.trouble into log.instability
ClosedPublic

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

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHGdb6b666ce1e6: label: rename log.trouble into log.instability
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

lothiraldan created this revision.Aug 7 2017, 6:11 AM
lothiraldan added a reviewer: quark.Aug 7 2017, 6:17 AM
lothiraldan added a subscriber: quark.

Here are hopefully the last patches of this series.

@quark I tried running the hg-experimental (https://bitbucket.org/facebook/hg-experimental) tests against this series.

I think I don't have the right environment setup, I have bunch of errors that seems related to my shell, not having a memcache available and not having the remotenames extension. Apart from these errors I didn't saw test output changes that seems related to this series.

test-lfs.t output changed with this series but also on mercurial stable but it could be my test environment again.

quark edited edge metadata.Aug 7 2017, 12:22 PM
In D259#4135, @lothiraldan wrote:

Here are hopefully the last patches of this series.
@quark I tried running the hg-experimental (https://bitbucket.org/facebook/hg-experimental) tests against this series.
I think I don't have the right environment setup, I have bunch of errors that seems related to my shell, not having a memcache available and not having the remotenames extension. Apart from these errors I didn't saw test output changes that seems related to this series.

Cool. Thanks!

Ideally those tests should be skipped automatically. I think there is some code detecting remotenames and skip accordingly.

test-lfs.t output changed with this series but also on mercurial stable but it could be my test environment again.

lfs is probably unrelated here.

Closed by commit rHGdb6b666ce1e6: label: rename log.trouble into log.instability (authored by lothiraldan). · Explain WhyAug 11 2017, 4:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 604

mercurial/cmdutil.py

# i18n: column positioning for "hg log" # i18n: column positioning for "hg log"
self.ui.write(_("date: %s\n") % date, self.ui.write(_("date: %s\n") % date,
label='log.date') label='log.date')
if ctx.isunstable(): if ctx.isunstable():
# i18n: column positioning for "hg log" # i18n: column positioning for "hg log"
instabilities = ctx.instabilities() instabilities = ctx.instabilities()
self.ui.write(_("instability: %s\n") % ', '.join(instabilities), self.ui.write(_("instability: %s\n") % ', '.join(instabilities),
label='log.trouble') label='log.instability')
self._exthook(ctx) self._exthook(ctx)
if self.ui.debugflag: if self.ui.debugflag:
files = ctx.p1().status(ctx)[:3] files = ctx.p1().status(ctx)[:3]
for key, value in zip([# i18n: column positioning for "hg log" for key, value in zip([# i18n: column positioning for "hg log"
_("files:"), _("files:"),
# i18n: column positioning for "hg log" # i18n: column positioning for "hg log"

mercurial/templates/map-cmdline.default

"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(instabilities, "{label('log.trouble', ltroubles = '{if(instabilities, "{label('log.instability',
'instability: {join(instabilities, ", ")}')}\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.t

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.unstable instability.orphan instability.phase-divergent|changeset: 7:50c51b361e60] [log.changeset changeset.draft changeset.unstable instability.orphan instability.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.instability|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.unstable instability.orphaninstability.phase-divergent|changeset: 7:50c51b361e60] [log.changeset changeset.draft changeset.unstable instability.orphaninstability.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.instability|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]
[log.parent changeset.draft|parent: 3:6f9641995072] [log.parent changeset.draft|parent: 3:6f9641995072]
[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]