diff hgext/rebase.py @ 26902:7ffebbdcb371

rebase: preserve the 'intermediate-source' attribute of grafts Preserving the 'source' attribute of grafts started with a69a77a80900, which predates the introduction of 'intermediate-source' in 51930a7180bd by a year and a half. It looks like not preserving this was an oversight. On a related note, notice how the source value of 32af76 is no longer visible in the graph above this test. Is it reasonable to import the sha1 translation from evolve.py:relocate() into scmutil or similar, and use that to fixup these attributes as well as the commit message? (I realize that evolve is still experimental, but I don't see a way to do this from the evolve extension.)
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 08 Nov 2015 17:56:48 -0500
parents 412e8c5e38b4
children f4fec0940278
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Nov 11 15:08:08 2015 -0600
+++ b/hgext/rebase.py	Sun Nov 08 17:56:48 2015 -0500
@@ -48,6 +48,9 @@
     s = ctx.extra().get('source', None)
     if s is not None:
         extra['source'] = s
+    s = ctx.extra().get('intermediate-source', None)
+    if s is not None:
+        extra['intermediate-source'] = s
 
 def _savebranch(ctx, extra):
     extra['branch'] = ctx.branch()