Show More
@@ -274,8 +274,12 b' def rebase(ui, repo, **opts):' | |||||
274 | "can't compute rebase set\n")) |
|
274 | "can't compute rebase set\n")) | |
275 | return 1 |
|
275 | return 1 | |
276 | commonanc = repo.revs('ancestor(%ld, %d)', base, dest).first() |
|
276 | commonanc = repo.revs('ancestor(%ld, %d)', base, dest).first() | |
277 | rebaseset = repo.revs('(%d::(%ld) - %d)::', |
|
277 | if commonanc is not None: | |
278 | commonanc, base, commonanc) |
|
278 | rebaseset = repo.revs('(%d::(%ld) - %d)::', | |
|
279 | commonanc, base, commonanc) | |||
|
280 | else: | |||
|
281 | rebaseset = [] | |||
|
282 | ||||
279 | if not rebaseset: |
|
283 | if not rebaseset: | |
280 | # transform to list because smartsets are not comparable to |
|
284 | # transform to list because smartsets are not comparable to | |
281 | # lists. This should be improved to honor laziness of |
|
285 | # lists. This should be improved to honor laziness of |
@@ -468,3 +468,17 b' Test --tool parameter:' | |||||
468 | [255] |
|
468 | [255] | |
469 |
|
469 | |||
470 | $ cd .. |
|
470 | $ cd .. | |
|
471 | ||||
|
472 | No common ancestor | |||
|
473 | ||||
|
474 | $ hg init separaterepo | |||
|
475 | $ cd separaterepo | |||
|
476 | $ touch a | |||
|
477 | $ hg commit -Aqm a | |||
|
478 | $ hg up -q null | |||
|
479 | $ touch b | |||
|
480 | $ hg commit -Aqm b | |||
|
481 | $ hg rebase -d 0 | |||
|
482 | nothing to rebase from d7486e00c6f1 to 3903775176ed | |||
|
483 | [1] | |||
|
484 | $ cd .. |
@@ -416,22 +416,22 b' test for --json' | |||||
416 | $ cat report.json |
|
416 | $ cat report.json | |
417 | testreport ={ |
|
417 | testreport ={ | |
418 | "test-failure.t": [\{] (re) |
|
418 | "test-failure.t": [\{] (re) | |
419 | "csys": "\s*[\d\.]{5}", (re) |
|
419 | "csys": "\s*[\d\.]{4,5}", ? (re) | |
420 |
|
|
420 | "cuser": "\s*[\d\.]{4,5}", ? (re) | |
421 |
|
|
421 | "result": "failure", ? (re) | |
422 | "time": "\s*[\d\.]{5}" (re) |
|
422 | "time": "\s*[\d\.]{4,5}" (re) | |
423 | }, |
|
423 | }, ? (re) | |
424 | "test-skip.t": { |
|
424 | "test-skip.t": { | |
425 | "csys": "\s*[\d\.]{5}", (re) |
|
425 | "csys": "\s*[\d\.]{4,5}", ? (re) | |
426 | "cuser": "\s*[\d\.]{5}", (re) |
|
426 | "cuser": "\s*[\d\.]{4,5}", ? (re) | |
427 | "result": "skip", |
|
427 | "result": "skip", ? (re) | |
428 | "time": "\s*[\d\.]{5}" (re) |
|
428 | "time": "\s*[\d\.]{4,5}" (re) | |
429 | }, |
|
429 | }, ? (re) | |
430 | "test-success.t": [\{] (re) |
|
430 | "test-success.t": [\{] (re) | |
431 | "csys": "\s*[\d\.]{5}", (re) |
|
431 | "csys": "\s*[\d\.]{4,5}", ? (re) | |
432 | "cuser": "\s*[\d\.]{5}", (re) |
|
432 | "cuser": "\s*[\d\.]{4,5}", ? (re) | |
433 | "result": "success", |
|
433 | "result": "success", ? (re) | |
434 | "time": "\s*[\d\.]{5}" (re) |
|
434 | "time": "\s*[\d\.]{4,5}" (re) | |
435 | } |
|
435 | } | |
436 | } (no-eol) |
|
436 | } (no-eol) | |
437 |
|
437 |
General Comments 0
You need to be logged in to leave comments.
Login now