Mercurial > hg
comparison tests/test-obsmarker-template.t @ 34578:794018ed8af0
test: use current user in the multi-user amend scenario
The obsfate template keyword that will be introduced in a later patch
distinguish between current user and other users when displaying the obsfate
users.
Update the test before for clarity.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 09 Oct 2017 08:35:55 +0200 |
parents | 3c1bb8a4275d |
children | eb586ed5d8ce |
comparison
equal
deleted
inserted
replaced
34577:3c1bb8a4275d | 34578:794018ed8af0 |
---|---|
40 $ hg init $TESTTMP/templates-local-amend | 40 $ hg init $TESTTMP/templates-local-amend |
41 $ cd $TESTTMP/templates-local-amend | 41 $ cd $TESTTMP/templates-local-amend |
42 $ mkcommit ROOT | 42 $ mkcommit ROOT |
43 $ mkcommit A0 | 43 $ mkcommit A0 |
44 $ echo 42 >> A0 | 44 $ echo 42 >> A0 |
45 $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" --config devel.user.obsmarker=test1 | 45 $ hg commit --amend -m "A1" --config devel.default-date="1234567890 0" |
46 $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 | 46 $ hg commit --amend -m "A2" --config devel.default-date="987654321 0" --config devel.user.obsmarker=test2 |
47 | 47 |
48 $ hg log --hidden -G | 48 $ hg log --hidden -G |
49 @ changeset: 3:d004c8f274b9 | 49 @ changeset: 3:d004c8f274b9 |
50 | tag: tip | 50 | tag: tip |
89 | 89 |
90 $ hg fatelog | 90 $ hg fatelog |
91 o d004c8f274b9 | 91 o d004c8f274b9 |
92 | | 92 | |
93 | @ 471f378eab4c | 93 | @ 471f378eab4c |
94 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); | 94 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000); |
95 o ea207398892e | 95 o ea207398892e |
96 | 96 |
97 $ hg up 'desc(A1)' --hidden | 97 $ hg up 'desc(A1)' --hidden |
98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 98 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
99 | 99 |
143 o d004c8f274b9 | 143 o d004c8f274b9 |
144 | | 144 | |
145 | @ a468dc9b3633 | 145 | @ a468dc9b3633 |
146 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | 146 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
147 | x 471f378eab4c | 147 | x 471f378eab4c |
148 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); | 148 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); |
149 o ea207398892e | 149 o ea207398892e |
150 | 150 |
151 | 151 |
152 Predecessors template shouldn't show anything as all obsolete commit are not | 152 Predecessors template shouldn't show anything as all obsolete commit are not |
153 visible. | 153 visible. |
188 @ d004c8f274b9 | 188 @ d004c8f274b9 |
189 | | 189 | |
190 | x a468dc9b3633 | 190 | x a468dc9b3633 |
191 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); | 191 |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000); |
192 | x 471f378eab4c | 192 | x 471f378eab4c |
193 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000); | 193 |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000); |
194 o ea207398892e | 194 o ea207398892e |
195 | 195 |
196 $ hg fatelogjson --hidden | 196 $ hg fatelogjson --hidden |
197 @ d004c8f274b9 | 197 @ d004c8f274b9 |
198 | | 198 | |
199 | x a468dc9b3633 | 199 | x a468dc9b3633 |
200 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] | 200 |/ Obsfate: [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"]}] |
201 | x 471f378eab4c | 201 | x 471f378eab4c |
202 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test1"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] | 202 |/ Obsfate: [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"]}] |
203 o ea207398892e | 203 o ea207398892e |
204 | 204 |
205 Test templates with splitted commit | 205 Test templates with splitted commit |
206 =================================== | 206 =================================== |
207 | 207 |