Mercurial > hg
comparison hgext/rebase.py @ 27058:616ea95c8f11
rebase: indentation change to make the next patch more legible
We put the code to be indented in the next patch in a "if True:" block to make
it easier to review.
| author | Laurent Charignon <lcharignon@fb.com> |
|---|---|
| date | Fri, 20 Nov 2015 11:36:05 -0800 |
| parents | 4223fc58f952 |
| children | 405320cd6198 |
comparison
equal
deleted
inserted
replaced
| 27057:c281c20ad0ad | 27058:616ea95c8f11 |
|---|---|
| 553 collapsedas = None | 553 collapsedas = None |
| 554 if collapsef: | 554 if collapsef: |
| 555 collapsedas = newnode | 555 collapsedas = newnode |
| 556 clearrebased(ui, repo, state, skipped, collapsedas) | 556 clearrebased(ui, repo, state, skipped, collapsedas) |
| 557 | 557 |
| 558 if currentbookmarks: | 558 if True: |
| 559 updatebookmarks(repo, targetnode, nstate, currentbookmarks) | 559 if currentbookmarks: |
| 560 if activebookmark not in repo._bookmarks: | 560 updatebookmarks(repo, targetnode, nstate, currentbookmarks) |
| 561 # active bookmark was divergent one and has been deleted | 561 if activebookmark not in repo._bookmarks: |
| 562 activebookmark = None | 562 # active bookmark was divergent one and has been deleted |
| 563 activebookmark = None | |
| 563 | 564 |
| 564 clearstatus(repo) | 565 clearstatus(repo) |
| 565 ui.note(_("rebase completed\n")) | 566 ui.note(_("rebase completed\n")) |
| 566 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) | 567 util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) |
| 567 if skipped: | 568 if skipped: |