comparison tests/test-evolve-templates.t @ 3049:02c4a0b550ab stable

obsfate: update test The obsfate templatekw and the obsfateprinter behavior was different when displaying or not the current user in obsfate users. Update the test to makes the behavior fix more visible.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 10 Oct 2017 16:12:44 +0200
parents bd7e8be29542
children 6603d5655192
comparison
equal deleted inserted replaced
3048:bdc28886526f 3049:02c4a0b550ab
31 $ hg init $TESTTMP/templates-local-amend 31 $ hg init $TESTTMP/templates-local-amend
32 $ cd $TESTTMP/templates-local-amend 32 $ cd $TESTTMP/templates-local-amend
33 $ mkcommit ROOT 33 $ mkcommit ROOT
34 $ mkcommit A0 34 $ mkcommit A0
35 $ echo 42 >> A0 35 $ echo 42 >> A0
36 $ HGUSER=test1 hg amend -m "A1" --config devel.default-date="1234567890 0" 36 $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0"
37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0" 37 $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
38 $ hg log --hidden -G 38 $ hg log --hidden -G
39 @ changeset: 4:d004c8f274b9 39 @ changeset: 4:d004c8f274b9
40 | tag: tip 40 | tag: tip
41 | parent: 0:ea207398892e 41 | parent: 0:ea207398892e
51 | summary: A1 51 | summary: A1
52 | 52 |
53 | x changeset: 2:f137d23bb3e1 53 | x changeset: 2:f137d23bb3e1
54 | | user: test 54 | | user: test
55 | | date: Thu Jan 01 00:00:00 1970 +0000 55 | | date: Thu Jan 01 00:00:00 1970 +0000
56 | | obsolete: pruned by test1 56 | | obsolete: pruned
57 | | summary: temporary amend commit for 471f378eab4c 57 | | summary: temporary amend commit for 471f378eab4c
58 | | 58 | |
59 | x changeset: 1:471f378eab4c 59 | x changeset: 1:471f378eab4c
60 |/ user: test 60 |/ user: test
61 | date: Thu Jan 01 00:00:00 1970 +0000 61 | date: Thu Jan 01 00:00:00 1970 +0000
62 | obsolete: rewritten by test1 as a468dc9b3633 62 | obsolete: rewritten as a468dc9b3633
63 | summary: A0 63 | summary: A0
64 | 64 |
65 o changeset: 0:ea207398892e 65 o changeset: 0:ea207398892e
66 user: test 66 user: test
67 date: Thu Jan 01 00:00:00 1970 +0000 67 date: Thu Jan 01 00:00:00 1970 +0000
80 | 80 |
81 x a468dc9b3633 (3) A1 81 x a468dc9b3633 (3) A1
82 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) 82 | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
83 | 83 |
84 @ 471f378eab4c (1) A0 84 @ 471f378eab4c (1) A0
85 rewritten(description, content) as a468dc9b3633 by test1 (Fri Feb 13 23:31:30 2009 +0000) 85 rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000)
86 86
87 $ hg tlog 87 $ hg tlog
88 o d004c8f274b9 88 o d004c8f274b9
89 | Precursors: 471f378eab4c 89 | Precursors: 471f378eab4c
90 | semi-colon: 471f378eab4c 90 | semi-colon: 471f378eab4c
91 | @ 471f378eab4c 91 | @ 471f378eab4c
92 |/ Successors: [d004c8f274b9] 92 |/ Successors: [d004c8f274b9]
93 | semi-colon: [d004c8f274b9] 93 | semi-colon: [d004c8f274b9]
94 | Fate: rewritten as d004c8f274b9 by test1, test2 94 | Fate: rewritten as d004c8f274b9 by test, test2
95 | 95 |
96 o ea207398892e 96 o ea207398892e
97 97
98 $ hg fatelog -q 98 $ hg fatelog -q
99 o d004c8f274b9 99 o d004c8f274b9
106 106
107 $ hg fatelog 107 $ hg fatelog
108 o d004c8f274b9 108 o d004c8f274b9
109 | 109 |
110 | @ 471f378eab4c 110 | @ 471f378eab4c
111 |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 111 |/ Obsfate: rewritten as d004c8f274b9 by test, test2
112 | 112 |
113 o ea207398892e 113 o ea207398892e
114 114
115 $ hg fatelog -v 115 $ hg fatelog -v
116 o d004c8f274b9 116 o d004c8f274b9
117 | 117 |
118 | @ 471f378eab4c 118 | @ 471f378eab4c
119 |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) 119 |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
120 | 120 |
121 o ea207398892e 121 o ea207398892e
122 122
123 123
124 (check json) 124 (check json)
168 | Successors: [d004c8f274b9] 168 | Successors: [d004c8f274b9]
169 | semi-colon: [d004c8f274b9] 169 | semi-colon: [d004c8f274b9]
170 | Fate: reworded as d004c8f274b9 by test2 170 | Fate: reworded as d004c8f274b9 by test2
171 | 171 |
172 | x f137d23bb3e1 172 | x f137d23bb3e1
173 | | Fate: pruned by test1 173 | | Fate: pruned
174 | | 174 | |
175 | x 471f378eab4c 175 | x 471f378eab4c
176 |/ Successors: [a468dc9b3633] 176 |/ Successors: [a468dc9b3633]
177 | semi-colon: [a468dc9b3633] 177 | semi-colon: [a468dc9b3633]
178 | Fate: rewritten as a468dc9b3633 by test1 178 | Fate: rewritten as a468dc9b3633
179 | 179 |
180 o ea207398892e 180 o ea207398892e
181 181
182 $ hg fatelog -v 182 $ hg fatelog -v
183 o d004c8f274b9 183 o d004c8f274b9
204 | Successors: [d004c8f274b9] 204 | Successors: [d004c8f274b9]
205 | semi-colon: [d004c8f274b9] 205 | semi-colon: [d004c8f274b9]
206 | Fate: reworded as d004c8f274b9 by test2 206 | Fate: reworded as d004c8f274b9 by test2
207 | 207 |
208 | x f137d23bb3e1 208 | x f137d23bb3e1
209 | | Fate: pruned by test1 209 | | Fate: pruned
210 | | 210 | |
211 | x 471f378eab4c 211 | x 471f378eab4c
212 |/ Successors: [a468dc9b3633] 212 |/ Successors: [a468dc9b3633]
213 | semi-colon: [a468dc9b3633] 213 | semi-colon: [a468dc9b3633]
214 | Fate: rewritten as a468dc9b3633 by test1 214 | Fate: rewritten as a468dc9b3633
215 | 215 |
216 o ea207398892e 216 o ea207398892e
217 217
218 $ hg fatelog -v 218 $ hg fatelog -v
219 @ d004c8f274b9 219 @ d004c8f274b9
226 | 226 |
227 | x a468dc9b3633 227 | x a468dc9b3633
228 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) 228 |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
229 | 229 |
230 | x f137d23bb3e1 230 | x f137d23bb3e1
231 | | Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000) 231 | | Obsfate: pruned by test (at 2009-02-13 23:31 +0000)
232 | | 232 | |
233 | x 471f378eab4c 233 | x 471f378eab4c
234 |/ Obsfate: rewritten as a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000) 234 |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
235 | 235 |
236 o ea207398892e 236 o ea207398892e
237 237
238 238
239 $ hg fatelogjson --hidden 239 $ hg fatelogjson --hidden
240 @ d004c8f274b9 "" 240 @ d004c8f274b9 ""
241 | 241 |
242 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] 242 | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}]
243 |/ 243 |/
244 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test1"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test1"], "verb": "pruned"}] 244 | x f137d23bb3e1 [{"markers": [["f137d23bb3e11dc1daeb6264fac9cb2433782e15", [], 0, [["ef1", "0"], ["user", "test"]], [1234567890.0, 0], ["471f378eab4c5e25f6c77f785b27c936efb22874"]]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": [], "users": ["test"], "verb": "pruned"}]
245 | | 245 | |
246 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test1"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] 246 | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}]
247 |/ 247 |/
248 o ea207398892e "" 248 o ea207398892e ""
249 249
250 250
251 Test templates with splitted commit 251 Test templates with splitted commit