Patchwork [02,of,11] test: rename obsfate template alias

login
register
mail settings
Submitter Boris Feld
Date Oct. 9, 2017, 6:40 p.m.
Message ID <c530db7ca893c8c1c93f.1507574444@FB>
Download mbox | patch
Permalink /patch/24666/
State Superseded
Headers show

Comments

Boris Feld - Oct. 9, 2017, 6:40 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1507300601 -7200
#      Fri Oct 06 16:36:41 2017 +0200
# Node ID c530db7ca893c8c1c93f47c775e0ccedc9ade91f
# Parent  fe4b0b77c2456419342cc50b4c697c7518be8d6c
# EXP-Topic obsfatekeyword
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r c530db7ca893
test: rename obsfate template alias

We will introduce an obsfate templatekw in the next patch that will conflict
with the obsfate template in the test file, rename the one in test file to
avoid this collision.

Patch

diff -r fe4b0b77c245 -r c530db7ca893 tests/test-obsmarker-template.t
--- a/tests/test-obsmarker-template.t	Fri Oct 06 16:15:24 2017 +0200
+++ b/tests/test-obsmarker-template.t	Fri Oct 06 16:36:41 2017 +0200
@@ -17,7 +17,7 @@ 
   > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}"
   > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}"
   > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}"
-  > obsfate = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
+  > obsfatetempl = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; "
   > [alias]
   > tlog = log -G -T '{node|short}\
   >     {if(predecessors, "\n  Predecessors: {predecessors}")}\
@@ -27,7 +27,7 @@ 
   >     {if(successorssets, "\n  Successors: {successorssets}")}\
   >     {if(successorssets, "\n  multi-line: {join(successorssets, "\n  multi-line: ")}")}\
   >     {if(successorssets, "\n  json: {successorssets|json}")}\n'
-  > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers % "{obsfate}"} \n" )}'
+  > fatelog = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers % "{obsfatetempl}"} \n" )}'
   > fatelogjson = log -G -T '{node|short}\n{if(succsandmarkers, "  Obsfate: {succsandmarkers|json}\n")}'
   > EOF