Mercurial > public > mercurial-scm > hg-stable

diff hgext/rebase.py @ 27977:b698abf971e7 stable 3.7.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: don't preserve most extra fields This backs out changeset 88fde8db5307. See the previous patches for why.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 03 Feb 2016 09:23:31 -0800
parents 8f4d3eeb5198
children ade12bf2bf0e 61f4d59e9a0b
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Feb 03 09:24:47 2016 -0800
+++ b/hgext/rebase.py	Wed Feb 03 09:23:31 2016 -0800
@@ -621,10 +621,7 @@
         if commitmsg is None:
             commitmsg = ctx.description()
         keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
-        extra = ctx.extra().copy()
-        if not keepbranches:
-            del extra['branch']
-        extra['rebase_source'] = ctx.hex()
+        extra = {'rebase_source': ctx.hex()}
         if extrafn:
             extrafn(ctx, extra)