Mercurial > evolve
comparison tests/test-evolve-obshistory-content-divergent.t @ 4983:6d40e0166522
obslog: make {node} the full node and leave shortening to template
It should be up to the user to shorten the nodeid as much or as little
as they like.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 04 Dec 2019 10:57:29 -0800 |
parents | 7bfd3fed5d1f |
children | 1f92a6aa40d6 |
comparison
equal
deleted
inserted
replaced
4982:ba683c5fe932 | 4983:6d40e0166522 |
---|---|
153 ], | 153 ], |
154 "user": "test", | 154 "user": "test", |
155 "verb": "rewritten" | 155 "verb": "rewritten" |
156 } | 156 } |
157 ], | 157 ], |
158 "node": "471f378eab4c", | 158 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
159 "shortdescription": "A0" | 159 "shortdescription": "A0" |
160 } | 160 } |
161 ] | 161 ] |
162 Check that debugobshistory on the first diverged revision show the revision | 162 Check that debugobshistory on the first diverged revision show the revision |
163 and the diverent one | 163 and the diverent one |
281 | 281 |
282 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool | 282 $ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson | python -m json.tool |
283 [ | 283 [ |
284 { | 284 { |
285 "markers": [], | 285 "markers": [], |
286 "node": "65b757b745b9", | 286 "node": "65b757b745b935093c87a2bccd877521cccffcbd", |
287 "shortdescription": "A2" | 287 "shortdescription": "A2" |
288 }, | 288 }, |
289 { | 289 { |
290 "markers": [ | 290 "markers": [ |
291 { | 291 { |
317 ], | 317 ], |
318 "user": "test", | 318 "user": "test", |
319 "verb": "rewritten" | 319 "verb": "rewritten" |
320 } | 320 } |
321 ], | 321 ], |
322 "node": "471f378eab4c", | 322 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
323 "shortdescription": "A0" | 323 "shortdescription": "A0" |
324 }, | 324 }, |
325 { | 325 { |
326 "markers": [], | 326 "markers": [], |
327 "node": "fdf9bde5129a", | 327 "node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e", |
328 "shortdescription": "A1" | 328 "shortdescription": "A1" |
329 } | 329 } |
330 ] | 330 ] |
331 $ hg update 471f378eab4c | 331 $ hg update 471f378eab4c |
332 abort: hidden revision '471f378eab4c' has diverged! | 332 abort: hidden revision '471f378eab4c' has diverged! |