This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1190

obsfate: rename obsfate into obsolete in default mapfile
ClosedPublic

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

Details

Reviewers
krbullock
Group Reviewers
hg-reviewers
Commits
rHGec765a71bd65: obsfate: rename obsfate into obsolete in default mapfile
Summary

Like the previous patch, replace obsfate by obsolete in default mapfile.

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 rHGec765a71bd65: obsfate: rename obsfate into obsolete in default mapfile (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 3040

mercurial/templates/map-cmdline.default

'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")}'
# Obsfate templates, it would be removed once we introduce the obsfate # Obsfate templates, it would be removed once we introduce the obsfate
# template fragment # template fragment
lobsfate = '{if(obsfate, "{label('log.obsfate', '{obsfate % "obsfate: {fate}\n"}')}")}' lobsfate = '{if(obsfate, "{label('log.obsfate', '{obsfate % "obsolete: {fate}\n"}')}")}'
[templatealias] [templatealias]
labelcset(expr) = label(separate(" ", labelcset(expr) = label(separate(" ",
"log.changeset", "log.changeset",
"changeset.{phase}", "changeset.{phase}",
if(obsolete, "changeset.obsolete"), if(obsolete, "changeset.obsolete"),
if(instabilities, "changeset.unstable"), if(instabilities, "changeset.unstable"),
join(instabilities join(instabilities
% "instability.{instability}", " ")), % "instability.{instability}", " ")),
expr) expr)

tests/test-obsmarker-template.t

| 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
$ hg up 'desc(A1)' --hidden $ hg up 'desc(A1)' --hidden
| 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
$ hg log -G -T "default" --hidden -v $ hg log -G -T "default" --hidden -v
@ changeset: 3:d004c8f274b9 @ changeset: 3:d004c8f274b9
| 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
| files: A0 | files: A0
| description: | description:
| A2 | 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 (at 2001-04-19 04:25 +0000) | obsolete: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
| files: A0 | files: A0
| description: | description:
| A1 | 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 by test (at 2009-02-13 23:31 +0000) | obsolete: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
| files: A0 | files: A0
| description: | description:
| A0 | 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
| 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
| 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
| 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
| |
| @ changeset: 2:fdf9bde5129a | @ 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
| 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
| 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
| |
| 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: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
| 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:f897c6137566 | | obsolete: rewritten as 3:f897c6137566
| | obsfate: rewritten as 1:471f378eab4c | | obsolete: rewritten as 1:471f378eab4c
| | 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 2:0dec01379d3b | obsolete: rewritten as 2:0dec01379d3b
| summary: A0 | summary: A0
| |
@ changeset: 0:ea207398892e @ 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: content-divergent | instability: content-divergent
| summary: Add only B | summary: Add only B
| |
| x changeset: 7:ba2ed02b0c9a | x changeset: 7:ba2ed02b0c9a
| | 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 rebase as 10:eceed8f98ffc | | obsolete: rewritten using rebase as 10:eceed8f98ffc
| | 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
| |
| @ changeset: 4:9bd10a0775e4 | @ changeset: 4:9bd10a0775e4
|/ 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 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a | obsolete: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
| summary: Add A,B,C | summary: Add A,B,C
| |
o changeset: 3:f897c6137566 o changeset: 3:f897c6137566
| 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:f897c6137566 | | obsolete: rewritten as 3:f897c6137566
| | obsfate: rewritten as 1:471f378eab4c | | obsolete: rewritten as 1:471f378eab4c
| | 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 2:0dec01379d3b | obsolete: rewritten as 2:0dec01379d3b
| 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 log -G -T "default" --hidden $ hg log -G -T "default" --hidden
x changeset: 3:65b757b745b9 x changeset: 3:65b757b745b9
| 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
| obsfate: pruned | obsolete: pruned
| 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: pruned | obsolete: pruned
| summary: A1 | summary: A1
| |
| @ 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: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
|/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000) |/ Obsfate: split as 2:617adc3a144c, 3:0d0ef4bdf70e by test (at 1970-01-01 00:00 +0000)
o ea207398892e o ea207398892e
$ hg log -G -T "default" --hidden $ hg log -G -T "default" --hidden
@ 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

tests/test-obsolete.t

instability: 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
obsfate: pruned obsolete: pruned
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.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.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]
[log.obsfate|obsfate: pruned] [log.obsfate|obsolete: pruned]
[log.summary|summary: add obsolete_e] [log.summary|summary: add obsolete_e]
test summary output test summary output
$ hg up -r 'phasedivergent() and orphan()' $ hg up -r 'phasedivergent() and orphan()'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg summary $ hg summary