Mercurial > hg

changeset 27058:616ea95c8f11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c281c20ad0ad
children 405320cd6198
files hgext/rebase.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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"))