[PATCH 1 of 2] rebase: indentation change to make the next patch more legible

Laurent Charignon lcharignon at fb.com
Fri Nov 20 23:14:46 UTC 2015


# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1448048165 28800
#      Fri Nov 20 11:36:05 2015 -0800
# Node ID ca0cab4184438d9fed896fb0157616899da95f6c
# Parent  8b9c04fb4c7e6d6cb872c63f7289ea679296dd3e
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 --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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"))


More information about the Mercurial-devel mailing list