Mercurial > public > mercurial-scm > hg

diff hgext/rebase.py @ 32327:3546a771e376

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: add operation metadata to rebase/amend/histedit obsmarkers By recording what operation created the obsmarker, we can show very intuitive messages to the user in various UIs. For instance, log output could have messages like "Amended as XXX" to show why a commit is old and has an 'x' on it. @ ac28e3 durham / First commit | | o d4afe7 durham | | Second commit | | | x 8e9a5d (Amended as ac28e3) durham |/ First commit |
author Durham Goode <durham@fb.com>
date Tue, 09 May 2017 16:29:31 -0700
parents a580b2d65ded
children 46ba2cdda476
line wrap: on
line diff
--- a/hgext/rebase.py	Wed May 17 22:33:15 2017 -0700
+++ b/hgext/rebase.py	Tue May 09 16:29:31 2017 -0700
@@ -1360,7 +1360,7 @@
                     succs = (repo[newrev],)
                 markers.append((repo[rev], succs))
         if markers:
-            obsolete.createmarkers(repo, markers)
+            obsolete.createmarkers(repo, markers, operation='rebase')
     else:
         rebased = [rev for rev in state
                    if state[rev] > nullmerge and state[rev] != rev]