# HG changeset patch # User Stefano Tortarolo # Date 1265559161 -3600 # Node ID f2558a8228be7dc016f03f08593c7c010cac1608 # Parent 13341047d5172f3f52dcf38d3d9f84209e3fb9fb 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. diff -r 13341047d517 -r f2558a8228be hgext/rebase.py --- 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'