# HG changeset patch # User Pierre-Yves David # Date 1495097768 -7200 # Node ID c07f752137f4caba43ff8ff6dbbad68145bde038 # Parent 1b348702d79efb182ce823e5e128fc58e6a5abc4 label: rename 'evolve.short_node' to 'evolve.node' A wider labelk will helps compatibility. diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py +++ b/hgext3rd/evolve/__init__.py @@ -163,7 +163,7 @@ obsexcmsg = utility.obsexcmsg -colortable = {'evolve.short_node': 'yellow', +colortable = {'evolve.node': 'yellow', 'evolve.user': 'green', 'evolve.rev': 'blue', 'evolve.short_description': '', diff --git a/hgext3rd/evolve/obshistory.py b/hgext3rd/evolve/obshistory.py --- a/hgext3rd/evolve/obshistory.py +++ b/hgext3rd/evolve/obshistory.py @@ -51,7 +51,7 @@ fm.startitem() fm.write('debugobshistory.node', '%s', str(ctx), - label="evolve.short_node") + label="evolve.node") fm.plain(' ') fm.write('debugobshistory.rev', '(%d)', int(ctx), @@ -66,7 +66,7 @@ hexnode = node.short(nodewithoutctx) fm.startitem() fm.write('debugobshistory.node', '%s', hexnode, - label="evolve.short_node evolve.missing_change_ctx") + label="evolve.node evolve.missing_change_ctx") fm.plain('\n') def _debugobshistorydisplaymarker(fm, repo, marker): @@ -100,6 +100,6 @@ shortsnodes = (node.short(succnode) for succnode in sorted(succnodes)) nodes = fm.formatlist(shortsnodes, 'debugobshistory.succnodes', sep=', ') fm.write('debugobshistory.succnodes', '%s', nodes, - label="evolve.short_node") + label="evolve.node") fm.plain("\n") diff --git a/tests/test-evolve-obshistory.t b/tests/test-evolve-obshistory.t --- a/tests/test-evolve-obshistory.t +++ b/tests/test-evolve-obshistory.t @@ -1301,8 +1301,8 @@ 471f378eab4c (1) A0 rewritten by test (*20*) as fdf9bde5129a (glob) $ hg debugobshistory 7a230b46bf61 --color=debug - [evolve.short_node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] - [evolve.short_node evolve.missing_change_ctx|fdf9bde5129a] - [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.short_node|7a230b46bf61] (glob) - [evolve.short_node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] - [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.short_node|fdf9bde5129a] (glob) + [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2] + [evolve.node evolve.missing_change_ctx|fdf9bde5129a] + [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.node|7a230b46bf61] (glob) + [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0] + [evolve.verb|rewritten] by [evolve.user|test] [evolve.date|(*20*)] as [evolve.node|fdf9bde5129a] (glob)