This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1189

obsfate: rename obsfate into obsolete in changeset_printer
ClosedPublic

Authored by lothiraldan on Oct 19 2017, 7:41 AM.

Details

Reviewers
krbullock
Group Reviewers
hg-reviewers
Commits
rHG3a3adbcbd3a0: obsfate: rename obsfate into obsolete in changeset_printer
Summary

Yuja's comment on the original obsfate about how we would translate obsfate
and the recent discussions about exposing users to new concepts and names lead
have led me to think that 'obsfate' should be treated as internal jargon. End-
users should not be aware of obsfate, so we replace 'obsfate' by 'obsolete' in
changeset_printer.

It will be easier to understand for end-users, easier to translate and closer
to the original Evolve obsfate output.

I'm aware it's extremely late in the cycle but I think it's an UX improvement
for the end-users.

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.Oct 19 2017, 7:41 AM
krbullock accepted this revision.Oct 19 2017, 3:32 PM
This revision is now accepted and ready to land.Oct 19 2017, 3:32 PM
Closed by commit rHG3a3adbcbd3a0: obsfate: rename obsfate into obsolete in changeset_printer (authored by lothiraldan). · Explain WhyOct 19 2017, 3:35 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3039

mercurial/cmdutil.py

self.showpatch(ctx, matchfn, hunksfilterfn=hunksfilterfn) self.showpatch(ctx, matchfn, hunksfilterfn=hunksfilterfn)
def _showobsfate(self, ctx): def _showobsfate(self, ctx):
obsfate = templatekw.showobsfate(repo=self.repo, ctx=ctx, ui=self.ui) obsfate = templatekw.showobsfate(repo=self.repo, ctx=ctx, ui=self.ui)
if obsfate: if obsfate:
for obsfateline in obsfate: for obsfateline in obsfate:
# i18n: column positioning for "hg log" # i18n: column positioning for "hg log"
self.ui.write(_("obsfate: %s\n") % obsfateline, self.ui.write(_("obsolete: %s\n") % obsfateline,
label='log.obsfate') label='log.obsfate')
def _exthook(self, ctx): def _exthook(self, ctx):
'''empty method used by extension as a hook point '''empty method used by extension as a hook point
''' '''
def showpatch(self, ctx, matchfn, hunksfilterfn=None): def showpatch(self, ctx, matchfn, hunksfilterfn=None):
if not matchfn: if not matchfn:

tests/test-commandserver.t

0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
*** runcommand phase -df tip *** runcommand phase -df tip
obsoleted 1 changesets obsoleted 1 changesets
*** runcommand log --hidden *** runcommand log --hidden
changeset: 1:731265503d86 changeset: 1:731265503d86
tag: tip tag: tip
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
obsfate: pruned obsolete: pruned
summary: . summary: .
changeset: 0:eff892de26ec changeset: 0:eff892de26ec
bookmark: bm1 bookmark: bm1
bookmark: bm2 bookmark: bm2
bookmark: bm3 bookmark: bm3
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000

tests/test-obsmarker-template.t

| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2 | summary: A2
| |
| x changeset: 2:a468dc9b3633 | x changeset: 2:a468dc9b3633
|/ parent: 0:ea207398892e |/ parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 3:d004c8f274b9 by test2 | obsolete: rewritten using amend as 3:d004c8f274b9 by test2
| summary: A1 | summary: A1
| |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 2:a468dc9b3633 | obsolete: rewritten using amend as 2:a468dc9b3633
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2 | summary: A2
| |
| @ changeset: 1:471f378eab4c | @ changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A0 | summary: A0
| |
| x changeset: 1:471597cad322 | x changeset: 1:471597cad322
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: split as 2:337fec4d2edc, 3:f257fde29c7a | obsolete: split as 2:337fec4d2edc, 3:f257fde29c7a
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: C0 | summary: C0
| |
| x changeset: 2:0dec01379d3b | x changeset: 2:0dec01379d3b
| | user: test | | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | obsfate: rewritten as 3:eb5a0daa2192 | | obsolete: rewritten as 3:eb5a0daa2192
| | summary: B0 | | summary: B0
| | | |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten as 3:eb5a0daa2192 | obsolete: rewritten as 3:eb5a0daa2192
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A1 | summary: A1
| |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 2:fdf9bde5129a | obsolete: rewritten using amend as 2:fdf9bde5129a
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ hg update --hidden 'desc(A0)' $ hg update --hidden 'desc(A0)'
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent | instability: content-divergent
| summary: A1 | summary: A1
| |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 2:fdf9bde5129a | obsolete: rewritten using amend as 2:fdf9bde5129a
| obsfate: rewritten using amend as 3:65b757b745b9 | obsolete: rewritten using amend as 3:65b757b745b9
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ hg commit --amend -m 'A3' $ hg commit --amend -m 'A3'
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 4:019fadeab383 @ changeset: 4:019fadeab383
| tag: tip | tag: tip
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent | instability: content-divergent
| summary: A3 | summary: A3
| |
| x changeset: 3:65b757b745b9 | x changeset: 3:65b757b745b9
|/ parent: 0:ea207398892e |/ parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 4:019fadeab383 | obsolete: rewritten using amend as 4:019fadeab383
| summary: A2 | summary: A2
| |
| o changeset: 2:fdf9bde5129a | o changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e |/ parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent | instability: content-divergent
| summary: A1 | summary: A1
| |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 2:fdf9bde5129a | obsolete: rewritten using amend as 2:fdf9bde5129a
| obsfate: rewritten using amend as 3:65b757b745b9 | obsolete: rewritten using amend as 3:65b757b745b9
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
| parent: 1:471f378eab4c | parent: 1:471f378eab4c
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: B1 | summary: B1
| |
| x changeset: 2:0dec01379d3b | x changeset: 2:0dec01379d3b
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 3:b7ea6d14e664 | obsolete: rewritten using amend as 3:b7ea6d14e664
| summary: B0 | summary: B0
| |
o changeset: 1:471f378eab4c o changeset: 1:471f378eab4c
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: C0 | summary: C0
| |
| x changeset: 3:b7ea6d14e664 | x changeset: 3:b7ea6d14e664
| | parent: 1:471f378eab4c | | parent: 1:471f378eab4c
| | user: test | | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | obsfate: rewritten as 4:eb5a0daa2192 | | obsolete: rewritten as 4:eb5a0daa2192
| | summary: B1 | | summary: B1
| | | |
| | x changeset: 2:0dec01379d3b | | x changeset: 2:0dec01379d3b
| |/ user: test | |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | obsfate: rewritten using amend as 3:b7ea6d14e664 | | obsolete: rewritten using amend as 3:b7ea6d14e664
| | summary: B0 | | summary: B0
| | | |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten as 4:eb5a0daa2192 | obsolete: rewritten as 4:eb5a0daa2192
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2 | summary: A2
| |
| x changeset: 2:fdf9bde5129a | x changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e |/ parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 3:7a230b46bf61 | obsolete: rewritten using amend as 3:7a230b46bf61
| summary: A1 | summary: A1
| |
| x changeset: 1:471f378eab4c | x changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 2:fdf9bde5129a | obsolete: rewritten using amend as 2:fdf9bde5129a
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
$ cd $TESTTMP/templates-local-remote-markers-2 $ cd $TESTTMP/templates-local-remote-markers-2
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2 | summary: A2
| |
| @ changeset: 1:471f378eab4c | @ changeset: 1:471f378eab4c
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 2:7a230b46bf61 | obsolete: rewritten using amend as 2:7a230b46bf61
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
| | user: test | | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000 | | date: Thu Jan 01 00:00:00 1970 +0000
| | instability: orphan, content-divergent | | instability: orphan, content-divergent
| | summary: Add A,B,C | | summary: Add A,B,C
| | | |
| x changeset: 6:4a004186e638 | x changeset: 6:4a004186e638
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: rewritten using amend as 8:b18bc8331526 | obsolete: rewritten using amend as 8:b18bc8331526
| obsfate: rewritten using amend as 9:0b997eb7ceee | obsolete: rewritten using amend as 9:0b997eb7ceee
| summary: Add A,B,C | summary: Add A,B,C
| |
o changeset: 5:dd800401bd8c o changeset: 5:dd800401bd8c
| parent: 3:f897c6137566 | parent: 3:f897c6137566
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| instability: content-divergent | instability: content-divergent
| summary: Add A,B,C | summary: Add A,B,C
$ hg debugobsolete --record-parent `getid "."` $ hg debugobsolete --record-parent `getid "."`
obsoleted 1 changesets obsoleted 1 changesets
$ hg log --hidden -G $ hg log --hidden -G
@ changeset: 3:0d0ef4bdf70e @ changeset: 3:0d0ef4bdf70e
| tag: tip | tag: tip
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: pruned | obsolete: pruned
| summary: A2 | summary: A2
| |
o changeset: 2:617adc3a144c o changeset: 2:617adc3a144c
| parent: 0:ea207398892e | parent: 0:ea207398892e
| user: test | user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| summary: A1 | summary: A1
| |
| x changeset: 1:471597cad322 | x changeset: 1:471597cad322
|/ user: test |/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000
| obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e | obsolete: split as 2:617adc3a144c, 3:0d0ef4bdf70e
| summary: A0 | summary: A0
| |
o changeset: 0:ea207398892e o changeset: 0:ea207398892e
user: test user: test
date: Thu Jan 01 00:00:00 1970 +0000 date: Thu Jan 01 00:00:00 1970 +0000
summary: ROOT summary: ROOT
Check templates Check templates

tests/test-obsolete.t

[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]
[log.obsfate|obsfate: pruned] [log.obsfate|obsolete: pruned]
[log.summary|summary: add obsolete_e] [log.summary|summary: add obsolete_e]
$ hg log -T default -r 'obsolete()' --color=debug $ hg log -T default -r 'obsolete()' --color=debug
[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]