metaedit: include "operation" metadata in obsmarkers
authorMartin von Zweigbergk <martinvonz@google.com>
Mon, 12 Mar 2018 15:51:07 -0700
changeset 3565 cfe31185ad07
parent 3564 589649021ea1
child 3566 e6bea259c227
metaedit: include "operation" metadata in obsmarkers
hgext3rd/evolve/cmdrewrite.py
tests/test-metaedit.t
--- a/hgext3rd/evolve/cmdrewrite.py	Mon Mar 12 15:50:59 2018 -0700
+++ b/hgext3rd/evolve/cmdrewrite.py	Mon Mar 12 15:51:07 2018 -0700
@@ -747,7 +747,7 @@
                 phases.retractboundary(repo, tr, targetphase, [newid])
                 compat.createmarkers(repo, [(ctx, (repo[newid],))
                                             for ctx in allctx],
-                                     metadata=metadata)
+                                     metadata=metadata, operation="metaedit")
             else:
                 ui.status(_("nothing changed\n"))
             tr.close()
--- a/tests/test-metaedit.t	Mon Mar 12 15:50:59 2018 -0700
+++ b/tests/test-metaedit.t	Mon Mar 12 15:51:07 2018 -0700
@@ -169,15 +169,15 @@
   @    a08d35fd7d9d (9) E
   |\
   x |  212b2a2b87cd (8) F
-  | |    rewritten(description, user, parent, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |    rewritten(description, user, parent, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   | |      note: folding changesets using metaedit
   | |
   | x  c2bd843aa246 (6) E
-  |      rewritten(description, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      rewritten(description, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   |        note: folding changesets using metaedit
   |
   x  587528abfffe (7) F
-       rewritten(user) as 212b2a2b87cd by test (Thu Jan 01 00:00:00 1970 +0000)
+       rewritten(user) as 212b2a2b87cd using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
   
 
 no new commit is created here because the date is the same