Mercurial > hg
comparison hgext/rebase.py @ 23266:3480c07fc934
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 11 Nov 2014 18:43:19 -0600 |
| parents | e53f6b72a0e4 643c58303fb0 |
| children | fc76f55705eb |
comparison
equal
deleted
inserted
replaced
| 23263:dd51abf0aa17 | 23266:3480c07fc934 |
|---|---|
| 272 if not base: | 272 if not base: |
| 273 ui.status(_('empty "base" revision set - ' | 273 ui.status(_('empty "base" revision set - ' |
| 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 |
| 282 # smartset. | 286 # smartset. |
| 283 if list(base) == [dest.rev()]: | 287 if list(base) == [dest.rev()]: |