Mercurial > hg
comparison hgext/rebase.py @ 27975:6f92d6bd2972 stable
rebase: backout changeset 986d04b9fedd
This is a dependency for a future backout of 88fde8db5307.
See the previous patches for why.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Wed, 03 Feb 2016 09:23:52 -0800 |
| parents | 07a5de79ec30 |
| children | 8f4d3eeb5198 |
comparison
equal
deleted
inserted
replaced
| 27974:bb14a81ce647 | 27975:6f92d6bd2972 |
|---|---|
| 395 external = externalparent(repo, state, targetancestors) | 395 external = externalparent(repo, state, targetancestors) |
| 396 | 396 |
| 397 if dest.closesbranch() and not keepbranchesf: | 397 if dest.closesbranch() and not keepbranchesf: |
| 398 ui.status(_('reopening closed branch head %s\n') % dest) | 398 ui.status(_('reopening closed branch head %s\n') % dest) |
| 399 | 399 |
| 400 if keepbranchesf and collapsef: | 400 if keepbranchesf: |
| 401 branches = set() | 401 if collapsef: |
| 402 for rev in state: | 402 branches = set() |
| 403 branches.add(repo[rev].branch()) | 403 for rev in state: |
| 404 if len(branches) > 1: | 404 branches.add(repo[rev].branch()) |
| 405 raise error.Abort(_('cannot collapse multiple named ' | 405 if len(branches) > 1: |
| 406 'branches')) | 406 raise error.Abort(_('cannot collapse multiple named ' |
| 407 'branches')) | |
| 407 | 408 |
| 408 # Rebase | 409 # Rebase |
| 409 if not targetancestors: | 410 if not targetancestors: |
| 410 targetancestors = repo.changelog.ancestors([target], inclusive=True) | 411 targetancestors = repo.changelog.ancestors([target], inclusive=True) |
| 411 | 412 |