142 ], |
142 ], |
143 "node": "471597cad322d1f659bb169751be9133dad92ef3", |
143 "node": "471597cad322d1f659bb169751be9133dad92ef3", |
144 "shortdescription": "A0" |
144 "shortdescription": "A0" |
145 } |
145 } |
146 ] |
146 ] |
|
147 $ hg obslog 471597cad322 --hidden --no-graph -Tjson | python -m json.tool |
|
148 [ |
|
149 { |
|
150 "markers": [], |
|
151 "node": "471597cad322d1f659bb169751be9133dad92ef3", |
|
152 "shortdescription": "A0" |
|
153 } |
|
154 ] |
147 Check that obslog on the first successor after split shows the revision plus |
155 Check that obslog on the first successor after split shows the revision plus |
148 the split one |
156 the split one |
149 $ hg obslog 337fec4d2edc --patch |
157 $ hg obslog 337fec4d2edc --patch |
150 o 337fec4d2edc (2) A0 |
158 o 337fec4d2edc (2) A0 |
151 | |
159 | split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
152 x 471597cad322 (1) A0 |
160 | note: testing split |
153 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
161 | diff -r 471597cad322 -r 337fec4d2edc b |
154 note: testing split |
162 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
155 (No patch available, too many successors (2)) |
163 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
164 | @@ -1,1 +0,0 @@ |
|
165 | -43 |
|
166 | |
|
167 | |
|
168 x 471597cad322 (1) A0 |
156 |
169 |
157 With the all option, it should show all three changesets |
170 With the all option, it should show all three changesets |
158 $ hg obslog --all 337fec4d2edc --patch |
171 $ hg obslog --all 337fec4d2edc --patch |
159 o 337fec4d2edc (2) A0 |
172 o 337fec4d2edc (2) A0 |
160 | |
173 | split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
161 | @ f257fde29c7a (3) A0 |
174 | note: testing split |
162 |/ |
175 | diff -r 471597cad322 -r 337fec4d2edc b |
163 x 471597cad322 (1) A0 |
176 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
164 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
177 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
165 note: testing split |
178 | @@ -1,1 +0,0 @@ |
166 (No patch available, too many successors (2)) |
179 | -43 |
|
180 | |
|
181 | |
|
182 | @ f257fde29c7a (3) A0 |
|
183 |/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
184 | note: testing split |
|
185 | (No patch available, changesets rebased) |
|
186 | |
|
187 x 471597cad322 (1) A0 |
167 |
188 |
168 Check that obslog on the second successor after split shows the revision plus |
189 Check that obslog on the second successor after split shows the revision plus |
169 the split one |
190 the split one |
170 $ hg obslog f257fde29c7a --patch |
191 $ hg obslog f257fde29c7a --patch |
171 @ f257fde29c7a (3) A0 |
192 @ f257fde29c7a (3) A0 |
172 | |
193 | split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
173 x 471597cad322 (1) A0 |
194 | note: testing split |
174 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
195 | (No patch available, changesets rebased) |
175 note: testing split |
196 | |
176 (No patch available, too many successors (2)) |
197 x 471597cad322 (1) A0 |
177 |
198 |
178 With the all option, it should show all three changesets |
199 With the all option, it should show all three changesets |
179 $ hg obslog f257fde29c7a --all --patch |
200 $ hg obslog f257fde29c7a --all --patch |
180 o 337fec4d2edc (2) A0 |
201 o 337fec4d2edc (2) A0 |
|
202 | split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
203 | note: testing split |
|
204 | diff -r 471597cad322 -r 337fec4d2edc b |
|
205 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
|
206 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
207 | @@ -1,1 +0,0 @@ |
|
208 | -43 |
|
209 | |
|
210 | |
|
211 | @ f257fde29c7a (3) A0 |
|
212 |/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
213 | note: testing split |
|
214 | (No patch available, changesets rebased) |
|
215 | |
|
216 x 471597cad322 (1) A0 |
|
217 |
|
218 Obslog with all option should also works on the split commit |
|
219 $ hg obslog -a 471597cad322 --hidden --patch --no-origin |
|
220 o 337fec4d2edc (2) A0 |
181 | |
221 | |
182 | @ f257fde29c7a (3) A0 |
222 | @ f257fde29c7a (3) A0 |
183 |/ |
223 |/ |
184 x 471597cad322 (1) A0 |
224 x 471597cad322 (1) A0 |
185 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
225 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
186 note: testing split |
226 note: testing split |
187 (No patch available, too many successors (2)) |
227 (No patch available, too many successors (2)) |
188 |
228 |
189 Obslog with all option all should also works on the split commit |
229 Check that obslog on both successors after split shows a coherent graph |
190 $ hg obslog -a 471597cad322 --hidden --patch |
230 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch --no-origin |
191 o 337fec4d2edc (2) A0 |
231 o 337fec4d2edc (2) A0 |
192 | |
232 | |
193 | @ f257fde29c7a (3) A0 |
233 | @ f257fde29c7a (3) A0 |
194 |/ |
234 |/ |
195 x 471597cad322 (1) A0 |
235 x 471597cad322 (1) A0 |
196 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
236 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
197 note: testing split |
237 note: testing split |
198 (No patch available, too many successors (2)) |
238 (No patch available, too many successors (2)) |
199 |
239 |
200 Check that obslog on both successors after split shows a coherent graph |
|
201 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
240 $ hg obslog 'f257fde29c7a+337fec4d2edc' --patch |
202 o 337fec4d2edc (2) A0 |
241 o 337fec4d2edc (2) A0 |
203 | |
242 | split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
204 | @ f257fde29c7a (3) A0 |
243 | note: testing split |
205 |/ |
244 | diff -r 471597cad322 -r 337fec4d2edc b |
206 x 471597cad322 (1) A0 |
245 | --- a/b Thu Jan 01 00:00:00 1970 +0000 |
207 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
246 | +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
208 note: testing split |
247 | @@ -1,1 +0,0 @@ |
209 (No patch available, too many successors (2)) |
248 | -43 |
|
249 | |
|
250 | |
|
251 | @ f257fde29c7a (3) A0 |
|
252 |/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
253 | note: testing split |
|
254 | (No patch available, changesets rebased) |
|
255 | |
|
256 x 471597cad322 (1) A0 |
210 |
257 |
211 $ hg update 471597cad322 |
258 $ hg update 471597cad322 |
212 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! |
259 abort: hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a! |
213 (use --hidden to access hidden revisions) |
260 (use --hidden to access hidden revisions) |
214 [255] |
261 [255] |
220 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
267 (use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a) |
221 |
268 |
222 Check output on the server side |
269 Check output on the server side |
223 ------------------------------- |
270 ------------------------------- |
224 |
271 |
225 $ hg obslog -R $TESTTMP/server --patch tip |
272 $ hg obslog -R $TESTTMP/server --patch tip --no-origin |
226 o f257fde29c7a (2) A0 |
273 o f257fde29c7a (2) A0 |
227 | |
274 | |
228 x 471597cad322 |
275 x 471597cad322 |
229 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
276 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
230 note: testing split |
277 note: testing split |
231 (No patch available, context is not local) |
278 (No patch available, context is not local) |
232 |
279 |
233 $ hg obslog -R $TESTTMP/server -f --patch tip |
280 $ hg obslog -R $TESTTMP/server -f --patch tip --no-origin |
234 o f257fde29c7a (2) A0 |
281 o f257fde29c7a (2) A0 |
235 |
282 |
236 $ hg obslog -R $TESTTMP/server --all --patch tip |
283 $ hg obslog -R $TESTTMP/server --all --patch tip --no-origin |
237 o 337fec4d2edc (1) A0 |
284 o 337fec4d2edc (1) A0 |
238 | |
285 | |
239 | o f257fde29c7a (2) A0 |
286 | o f257fde29c7a (2) A0 |
240 |/ |
287 |/ |
241 x 471597cad322 |
288 x 471597cad322 |
242 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
289 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
243 note: testing split |
290 note: testing split |
244 (No patch available, context is not local) |
291 (No patch available, context is not local) |
245 |
292 |
246 $ hg obslog -R $TESTTMP/server --all -f --patch tip |
293 $ hg obslog -R $TESTTMP/server --all -f --patch tip --no-origin |
247 o 337fec4d2edc (1) A0 |
294 o 337fec4d2edc (1) A0 |
248 |
295 |
249 o f257fde29c7a (2) A0 |
296 o f257fde29c7a (2) A0 |
250 |
297 |
251 $ hg obslog -R $TESTTMP/server --no-graph --all --patch tip |
298 $ hg obslog -R $TESTTMP/server --no-graph --all --patch tip --no-origin |
252 f257fde29c7a (2) A0 |
299 f257fde29c7a (2) A0 |
253 |
300 |
254 471597cad322 |
301 471597cad322 |
255 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
302 split(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000) |
256 note: testing split |
303 note: testing split |
257 (No patch available, context is not local) |
304 (No patch available, context is not local) |
258 |
305 |
259 337fec4d2edc (1) A0 |
306 337fec4d2edc (1) A0 |
260 |
307 |
|
308 $ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip --no-origin |
|
309 f257fde29c7a (2) A0 |
|
310 |
|
311 337fec4d2edc (1) A0 |
|
312 |
|
313 |
|
314 $ hg obslog -R $TESTTMP/server --patch tip |
|
315 o f257fde29c7a (2) A0 |
|
316 | split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
317 | note: testing split |
|
318 | (No patch available, predecessor is unknown locally) |
|
319 | |
|
320 x 471597cad322 |
|
321 |
|
322 $ hg obslog -R $TESTTMP/server -f --patch tip |
|
323 o f257fde29c7a (2) A0 |
|
324 |
|
325 $ hg obslog -R $TESTTMP/server --all --patch tip |
|
326 o 337fec4d2edc (1) A0 |
|
327 | split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
328 | note: testing split |
|
329 | (No patch available, predecessor is unknown locally) |
|
330 | |
|
331 | o f257fde29c7a (2) A0 |
|
332 |/ split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
333 | note: testing split |
|
334 | (No patch available, predecessor is unknown locally) |
|
335 | |
|
336 x 471597cad322 |
|
337 |
|
338 $ hg obslog -R $TESTTMP/server --all -f --patch tip |
|
339 o 337fec4d2edc (1) A0 |
|
340 |
|
341 o f257fde29c7a (2) A0 |
|
342 |
|
343 $ hg obslog -R $TESTTMP/server --no-graph --all --patch tip |
|
344 f257fde29c7a (2) A0 |
|
345 split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
346 note: testing split |
|
347 (No patch available, predecessor is unknown locally) |
|
348 |
|
349 471597cad322 |
|
350 |
|
351 337fec4d2edc (1) A0 |
|
352 split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000) |
|
353 note: testing split |
|
354 (No patch available, predecessor is unknown locally) |
|
355 |
261 $ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip |
356 $ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip |
262 f257fde29c7a (2) A0 |
357 f257fde29c7a (2) A0 |
263 |
358 |
264 337fec4d2edc (1) A0 |
359 337fec4d2edc (1) A0 |
265 |
360 |