Mercurial > hg-stable

changeset 10677:f2558a8228be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add option to not commit after a collapsing This option is useful when other extensions (e.g., pbranch) want to use rebase --collapse and append other things before committing. This is not intended to be used from command line.
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Sun, 07 Feb 2010 17:12:41 +0100
parents 13341047d517
children da2a0c9c895d
files hgext/rebase.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Sat Mar 13 20:02:46 2010 +0100
+++ b/hgext/rebase.py	Sun Feb 07 17:12:41 2010 +0100
@@ -87,6 +87,9 @@
         keepf = opts.get('keep', False)
         keepbranchesf = opts.get('keepbranches', False)
         detachf = opts.get('detach', False)
+        # keepopen is not meant for use on the command line, but by
+        # other extensions
+        keepopen = opts.get('keepopen', False)
 
         if contf or abortf:
             if contf and abortf:
@@ -181,7 +184,7 @@
 
         ui.note(_('rebase merging completed\n'))
 
-        if collapsef:
+        if collapsef and not keepopen:
             p1, p2 = defineparents(repo, min(state), target,
                                                         state, targetancestors)
             commitmsg = 'Collapsed revision'