equal
deleted
inserted
replaced
113 |
113 |
114 |
114 |
115 |
115 |
116 Test that content diff works with templating |
116 Test that content diff works with templating |
117 $ hg obslog --color=debug --patch 4ae3a4151de9 \ |
117 $ hg obslog --color=debug --patch 4ae3a4151de9 \ |
118 > -T '{node} {desc|firstline}\n{markers % "patch:\n```{patch}```\n"}' |
118 > -T '{node|short} {desc|firstline}\n{markers % "patch:\n```{patch}```\n"}' |
119 @ 4ae3a4151de9 A1 |
119 @ 4ae3a4151de9 A1 |
120 | |
120 | |
121 x 471f378eab4c A0 |
121 x 471f378eab4c A0 |
122 patch: |
122 patch: |
123 ``` |
123 ``` |
143 |
143 |
144 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
144 $ hg obslog 4ae3a4151de9 --no-graph -Tjson | python -m json.tool |
145 [ |
145 [ |
146 { |
146 { |
147 "markers": [], |
147 "markers": [], |
148 "node": "4ae3a4151de9", |
148 "node": "4ae3a4151de9aa872113f0b196e28323308981e8", |
149 "shortdescription": "A1" |
149 "shortdescription": "A1" |
150 }, |
150 }, |
151 { |
151 { |
152 "markers": [ |
152 "markers": [ |
153 { |
153 { |
165 ], |
165 ], |
166 "user": "test", |
166 "user": "test", |
167 "verb": "rewritten" |
167 "verb": "rewritten" |
168 } |
168 } |
169 ], |
169 ], |
170 "node": "471f378eab4c", |
170 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
171 "shortdescription": "A0" |
171 "shortdescription": "A0" |
172 } |
172 } |
173 ] |
173 ] |
174 $ hg obslog --hidden --patch 471f378eab4c |
174 $ hg obslog --hidden --patch 471f378eab4c |
175 x 471f378eab4c (1) A0 |
175 x 471f378eab4c (1) A0 |
210 ], |
210 ], |
211 "user": "test", |
211 "user": "test", |
212 "verb": "rewritten" |
212 "verb": "rewritten" |
213 } |
213 } |
214 ], |
214 ], |
215 "node": "471f378eab4c", |
215 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
216 "shortdescription": "A0" |
216 "shortdescription": "A0" |
217 } |
217 } |
218 ] |
218 ] |
219 $ hg update 471f378eab4c |
219 $ hg update 471f378eab4c |
220 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! |
220 abort: hidden revision '471f378eab4c' was rewritten as: 4ae3a4151de9! |
373 +42 |
373 +42 |
374 |
374 |
375 |
375 |
376 Test that description diff works with templating |
376 Test that description diff works with templating |
377 $ hg obslog --color=debug --patch 92210308515b \ |
377 $ hg obslog --color=debug --patch 92210308515b \ |
378 > -T '{node} {desc|firstline}\n{markers % "description diff:\n```{descdiff}```\n"}' |
378 > -T '{node|short} {desc|firstline}\n{markers % "description diff:\n```{descdiff}```\n"}' |
379 @ 92210308515b A3 |
379 @ 92210308515b A3 |
380 | |
380 | |
381 x 4f1685185907 A2 |
381 x 4f1685185907 A2 |
382 | description diff: |
382 | description diff: |
383 | ``` |
383 | ``` |