Mercurial > hg > evolve

changeset 619:f50f8da7a077 compat-hg2.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a -e option to fold
author Denis Laxalde <denis.laxalde@logilab.fr>
date Mon, 26 Nov 2012 11:59:40 +0100
parents 148bf61583f4
children 232536f5c987
files hgext/evolve.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2191,7 +2191,8 @@
         lockmod.release(lock, wlock)
 
 @command('^fold',
-    [('r', 'rev', [], 'revisions to fold'),],
+    [('r', 'rev', [], 'revisions to fold'),
+    ],
     # allow to choose the seed ?
     _('[-r] revs'))
 def fold(ui, repo, *revs, **opts):
@@ -2222,9 +2223,11 @@
             allctx = [repo[r] for r in revs]
             targetphase = max(c.phase() for c in allctx)
             msg = '\n\n***\n\n'.join(c.description() for c in allctx)
+            commitopts = {'message': msg}
+            commitopts['edit'] = True
             newid, _ = rewrite(repo, root, allctx, head,
                              [root.p1().node(), root.p2().node()],
-                             commitopts={'message': msg})
+                             commitopts=commitopts)
             phases.retractboundary(repo, targetphase, [newid])
             createmarkers(repo, [(ctx, (repo[newid],))
                                  for ctx in allctx])