78 summary: ROOT |
77 summary: ROOT |
79 |
78 |
80 Actual test |
79 Actual test |
81 ----------- |
80 ----------- |
82 |
81 |
83 Check that debugobshistory on head show a coherent graph |
82 Check that obslog on head shows a coherent graph |
84 $ hg obslog eb5a0daa2192 --patch |
83 $ hg obslog eb5a0daa2192 --patch --no-origin |
85 @ eb5a0daa2192 (4) C0 |
84 @ eb5a0daa2192 (4) C0 |
86 |\ |
85 |\ |
87 x | 471f378eab4c (1) A0 |
86 x | 471f378eab4c (1) A0 |
88 / folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
87 / folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
89 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
88 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
112 @@ -1,1 +1,1 @@ |
111 @@ -1,1 +1,1 @@ |
113 -B0 |
112 -B0 |
114 +B1 |
113 +B1 |
115 |
114 |
116 |
115 |
117 Check that obslog on ROOT with all option show everything |
116 $ hg obslog eb5a0daa2192 --patch |
118 $ hg obslog 1 --hidden --all --patch |
117 @ eb5a0daa2192 (4) C0 |
|
118 |\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
119 | | (No patch available, too many predecessors (2)) |
|
120 | | |
|
121 x | 471f378eab4c (1) A0 |
|
122 / |
|
123 x b7ea6d14e664 (3) B1 |
|
124 | reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
125 | diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
|
126 | --- a/changeset-description |
|
127 | +++ b/changeset-description |
|
128 | @@ -1,1 +1,1 @@ |
|
129 | -B0 |
|
130 | +B1 |
|
131 | |
|
132 | |
|
133 x 0dec01379d3b (2) B0 |
|
134 |
|
135 Check that obslog on A0 with all option shows everything |
|
136 $ hg obslog 1 --hidden --all --patch --no-origin |
119 @ eb5a0daa2192 (4) C0 |
137 @ eb5a0daa2192 (4) C0 |
120 |\ |
138 |\ |
121 x | 471f378eab4c (1) A0 |
139 x | 471f378eab4c (1) A0 |
122 / folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
140 / folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
123 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
141 | diff -r 471f378eab4c -r eb5a0daa2192 changeset-description |
146 @@ -1,1 +1,1 @@ |
164 @@ -1,1 +1,1 @@ |
147 -B0 |
165 -B0 |
148 +B1 |
166 +B1 |
149 |
167 |
150 |
168 |
151 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
169 $ hg obslog 1 --hidden --all --patch |
|
170 @ eb5a0daa2192 (4) C0 |
|
171 |\ folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000) |
|
172 | | (No patch available, too many predecessors (2)) |
|
173 | | |
|
174 x | 471f378eab4c (1) A0 |
|
175 / |
|
176 x b7ea6d14e664 (3) B1 |
|
177 | reworded(description) from 0dec01379d3b using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
178 | diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description |
|
179 | --- a/changeset-description |
|
180 | +++ b/changeset-description |
|
181 | @@ -1,1 +1,1 @@ |
|
182 | -B0 |
|
183 | +B1 |
|
184 | |
|
185 | |
|
186 x 0dec01379d3b (2) B0 |
|
187 |
|
188 $ hg obslog eb5a0daa2192 --no-graph --no-origin -Tjson | python -m json.tool |
152 [ |
189 [ |
153 { |
190 { |
154 "markers": [], |
191 "markers": [], |
155 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0", |
192 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0", |
156 "shortdescription": "C0" |
193 "shortdescription": "C0" |
157 }, |
194 }, |
158 { |
195 { |
159 "markers": [ |
196 "markers": [ |
160 { |
197 { |
161 "date": [ |
198 "dates": [ |
162 *, (glob) |
199 [ |
163 0 |
200 *, (glob) |
|
201 0 |
|
202 ] |
164 ], |
203 ], |
165 "effects": [ |
204 "effects": [ |
166 *, (glob) |
205 *, (glob) |
167 *, (glob) |
206 *, (glob) |
168 "content" |
207 "content" |
169 ], |
208 ], |
170 "operation": "fold", |
209 "operations": [ |
|
210 "fold" |
|
211 ], |
171 "succnodes": [ |
212 "succnodes": [ |
172 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" |
213 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" |
173 ], |
214 ], |
174 "user": "test", |
215 "users": [ |
|
216 "test" |
|
217 ], |
175 "verb": "folded" |
218 "verb": "folded" |
176 } |
219 } |
177 ], |
220 ], |
178 "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07", |
221 "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07", |
179 "shortdescription": "B1" |
222 "shortdescription": "B1" |
180 }, |
223 }, |
181 { |
224 { |
182 "markers": [ |
225 "markers": [ |
183 { |
226 { |
184 "date": [ |
227 "dates": [ |
185 *, (glob) |
228 [ |
186 0 |
229 *, (glob) |
|
230 0 |
|
231 ] |
187 ], |
232 ], |
188 "effects": [ |
233 "effects": [ |
189 "description" |
234 "description" |
190 ], |
235 ], |
191 "operation": "amend", |
236 "operations": [ |
|
237 "amend" |
|
238 ], |
192 "succnodes": [ |
239 "succnodes": [ |
193 "b7ea6d14e664bdc8922221f7992631b50da3fb07" |
240 "b7ea6d14e664bdc8922221f7992631b50da3fb07" |
194 ], |
241 ], |
195 "user": "test", |
242 "users": [ |
|
243 "test" |
|
244 ], |
196 "verb": "reworded" |
245 "verb": "reworded" |
197 } |
246 } |
198 ], |
247 ], |
199 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5", |
248 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5", |
200 "shortdescription": "B0" |
249 "shortdescription": "B0" |
201 }, |
250 }, |
202 { |
251 { |
203 "markers": [ |
252 "markers": [ |
204 { |
253 { |
205 "date": [ |
254 "dates": [ |
206 *, (glob) |
255 [ |
207 0 |
256 *, (glob) |
|
257 0 |
|
258 ] |
208 ], |
259 ], |
209 "effects": [ |
260 "effects": [ |
210 "description", |
261 "description", |
211 "content" |
262 "content" |
212 ], |
263 ], |
213 "operation": "fold", |
264 "operations": [ |
|
265 "fold" |
|
266 ], |
214 "succnodes": [ |
267 "succnodes": [ |
215 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" |
268 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0" |
216 ], |
269 ], |
217 "user": "test", |
270 "users": [ |
|
271 "test" |
|
272 ], |
218 "verb": "folded" |
273 "verb": "folded" |
219 } |
274 } |
220 ], |
275 ], |
|
276 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
|
277 "shortdescription": "A0" |
|
278 } |
|
279 ] |
|
280 $ hg obslog eb5a0daa2192 --no-graph -Tjson | python -m json.tool |
|
281 [ |
|
282 { |
|
283 "markers": [ |
|
284 { |
|
285 "dates": [ |
|
286 [ |
|
287 *, (glob) |
|
288 0 |
|
289 ], |
|
290 [ |
|
291 *, (glob) |
|
292 0 |
|
293 ] |
|
294 ], |
|
295 "effects": [ |
|
296 *, (glob) |
|
297 *, (glob) |
|
298 "content" |
|
299 ], |
|
300 "operations": [ |
|
301 "fold" |
|
302 ], |
|
303 "prednodes": [ |
|
304 "471f378eab4c5e25f6c77f785b27c936efb22874", |
|
305 "b7ea6d14e664bdc8922221f7992631b50da3fb07" |
|
306 ], |
|
307 "users": [ |
|
308 "test" |
|
309 ], |
|
310 "verb": "folded" |
|
311 } |
|
312 ], |
|
313 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0", |
|
314 "shortdescription": "C0" |
|
315 }, |
|
316 { |
|
317 "markers": [ |
|
318 { |
|
319 "dates": [ |
|
320 [ |
|
321 *, (glob) |
|
322 0 |
|
323 ] |
|
324 ], |
|
325 "effects": [ |
|
326 "description" |
|
327 ], |
|
328 "operations": [ |
|
329 "amend" |
|
330 ], |
|
331 "prednodes": [ |
|
332 "0dec01379d3be6318c470ead31b1fe7ae7cb53d5" |
|
333 ], |
|
334 "users": [ |
|
335 "test" |
|
336 ], |
|
337 "verb": "reworded" |
|
338 } |
|
339 ], |
|
340 "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07", |
|
341 "shortdescription": "B1" |
|
342 }, |
|
343 { |
|
344 "markers": [], |
|
345 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5", |
|
346 "shortdescription": "B0" |
|
347 }, |
|
348 { |
|
349 "markers": [], |
221 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
350 "node": "471f378eab4c5e25f6c77f785b27c936efb22874", |
222 "shortdescription": "A0" |
351 "shortdescription": "A0" |
223 } |
352 } |
224 ] |
353 ] |
225 $ hg update 471f378eab4c |
354 $ hg update 471f378eab4c |