comparison tests/test-evolve-obshistory-phase-divergent.t @ 4918:f16274729530

obslog: don't overwrite {rev} keyword from changeset context Now that we have the whole changeset in the formatter context, there's no need to explicitly add {rev}. We should also deprecate the {shortdescription} keyword since it's no longer needed, but I don't know how to do that.
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 04 Nov 2019 14:58:58 -0800
parents aab2afc2bd82
children 7aba58dc4b73
comparison
equal deleted inserted replaced
4917:d1d8e97d32af 4918:f16274729530
112 "user": "test", 112 "user": "test",
113 "verb": "rewritten" 113 "verb": "rewritten"
114 } 114 }
115 ], 115 ],
116 "node": "471f378eab4c", 116 "node": "471f378eab4c",
117 "rev": 1,
118 "shortdescription": "A0" 117 "shortdescription": "A0"
119 } 118 }
120 ] 119 ]
121 Check that debugobshistory on the first diverged revision show the revision 120 Check that debugobshistory on the first diverged revision show the revision
122 and the diverent one 121 and the diverent one
195 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --no-graph -Tjson | python -m json.tool 194 $ hg obslog 'fdf9bde5129a+fdf9bde5129a' --no-graph -Tjson | python -m json.tool
196 [ 195 [
197 { 196 {
198 "markers": [], 197 "markers": [],
199 "node": "fdf9bde5129a", 198 "node": "fdf9bde5129a",
200 "rev": 2,
201 "shortdescription": "A1" 199 "shortdescription": "A1"
202 }, 200 },
203 { 201 {
204 "markers": [ 202 "markers": [
205 { 203 {
217 "user": "test", 215 "user": "test",
218 "verb": "rewritten" 216 "verb": "rewritten"
219 } 217 }
220 ], 218 ],
221 "node": "471f378eab4c", 219 "node": "471f378eab4c",
222 "rev": 1,
223 "shortdescription": "A0" 220 "shortdescription": "A0"
224 } 221 }
225 ] 222 ]
226 $ hg update 471f378eab4c 223 $ hg update 471f378eab4c
227 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 224 0 files updated, 0 files merged, 0 files removed, 0 files unresolved