# HG changeset patch # User Martin von Zweigbergk # Date 1600989358 25200 # Node ID 18fa4797b5dd1253f1378cba52aedd7dcc2d8df4 # Parent 582e3be0a27767c83f8e6fcd8e9c56b6f1a7285b evolvecmd: delete bookmark-handling code obsolete since move away from rebase We haven't relied on `rebase.rebasenode()` since 58370c718183 (evolve: use `merge.graft` instead of `rebasenode`, 2014-12-13), so we don't need to compensate for it. diff -r 582e3be0a277 -r 18fa4797b5dd hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Thu Sep 24 15:33:01 2020 -0700 +++ b/hgext3rd/evolve/evolvecmd.py Thu Sep 24 16:15:58 2020 -0700 @@ -956,7 +956,6 @@ date=orig.date(), extra=extra) def _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate): - destbookmarks = repo.nodebookmarks(dest.node()) nodesrc = orig.node() oldbookmarks = repo.nodebookmarks(nodesrc) bmchanges = [] @@ -976,8 +975,6 @@ for book in oldbookmarks: evolvestate[b'bookmarkchanges'].append((book, nodesrc)) bmchanges.append((book, dest.node())) - for book in destbookmarks: # restore bookmark that rebase move - bmchanges.append((book, dest.node())) if bmchanges: repo._bookmarks.applychanges(repo, tr, bmchanges)