Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 27973:ce9696193175 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: don't preserve most extra fields This backs out changeset 39163708825cd. There are some extra fields that absolutely should not be preserved, like the convert_revision field introduced by the convert and hgsubversion extensions. The problem with extensions blacklisting certain extra fields is that they might not be enabled at the time the amend is performed. In the long run we probably want separately marked transferable and non-transferable extra fields, but for now restore the old Mercurial 3.6 behavior.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 03 Feb 2016 08:59:46 -0800
parents 02c5f8ad00ac
children 79139c7a88bd cb6a952efbf4
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Wed Feb 03 11:01:11 2016 -0200
+++ b/mercurial/cmdutil.py	Wed Feb 03 08:59:46 2016 -0800
@@ -2623,11 +2623,6 @@
                 message = old.description()
 
             pureextra = extra.copy()
-            if 'amend_source' in pureextra:
-                del pureextra['amend_source']
-            pureoldextra = old.extra()
-            if 'amend_source' in pureoldextra:
-                del pureoldextra['amend_source']
             extra['amend_source'] = old.hex()
 
             new = context.memctx(repo,
@@ -2645,7 +2640,7 @@
                 and newdesc == old.description()
                 and user == old.user()
                 and date == old.date()
-                and pureextra == pureoldextra):
+                and pureextra == old.extra()):
                 # nothing changed. continuing here would create a new node
                 # anyway because of the amend_source noise.
                 #