# HG changeset patch # User Laurent Charignon # Date 1448048165 28800 # Node ID 616ea95c8f11a474c1be0593a1d0548e8c332bac # Parent c281c20ad0adffe03aa9594d4a0b56dec68e8598 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. diff -r c281c20ad0ad -r 616ea95c8f11 hgext/rebase.py --- a/hgext/rebase.py Mon Nov 16 16:56:00 2015 -0500 +++ b/hgext/rebase.py Fri Nov 20 11:36:05 2015 -0800 @@ -555,11 +555,12 @@ collapsedas = newnode clearrebased(ui, repo, state, skipped, collapsedas) - if currentbookmarks: - updatebookmarks(repo, targetnode, nstate, currentbookmarks) - if activebookmark not in repo._bookmarks: - # active bookmark was divergent one and has been deleted - activebookmark = None + if True: + if currentbookmarks: + updatebookmarks(repo, targetnode, nstate, currentbookmarks) + if activebookmark not in repo._bookmarks: + # active bookmark was divergent one and has been deleted + activebookmark = None clearstatus(repo) ui.note(_("rebase completed\n"))