# HG changeset patch # User Martin von Zweigbergk # Date 1576818931 28800 # Node ID edcff79a31929ad12e37155256a6f4cef87123e4 # Parent 8f6095e88d1c3cf2bd3b6e77ec140a75a87530a7 evolvecmd: avoid a ctx->node->ctx conversion diff -r 8f6095e88d1c -r edcff79a3192 hgext3rd/evolve/evolvecmd.py --- 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))