Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: avoid a ctx->node->ctx conversion
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 19 Dec 2019 21:15:31 -0800
changeset 5021 edcff79a3192
parent 5020 8f6095e88d1c
child 5022 95af630d913a
evolvecmd: avoid a ctx->node->ctx conversion
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/evolvecmd.py	Thu Dec 19 13:06:29 2019 -0800
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Dec 19 21:15:31 2019 -0800
@@ -1041,7 +1041,7 @@
     bmchanges = []
 
     if nodenew is not None:
-        obsolete.createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))],
+        obsolete.createmarkers(repo, [(orig, (repo[nodenew],))],
                                operation=b'evolve')
         for book in oldbookmarks:
             bmchanges.append((book, nodenew))
@@ -1050,7 +1050,7 @@
         if category == b'orphan':
             repo.ui.status(_(b"evolution of %d:%s created no changes "
                              b"to commit\n") % (orig.rev(), orig))
-        obsolete.createmarkers(repo, [(repo[nodesrc], ())], operation=b'evolve')
+        obsolete.createmarkers(repo, [(orig, ())], operation=b'evolve')
         # Behave like rebase, move bookmarks to dest
         for book in oldbookmarks:
             evolvestate[b'bookmarkchanges'].append((book, nodesrc))
evolve