# HG changeset patch # User Pierre-Yves David # Date 1524149513 -7200 # Node ID 3680f715c14f0bdbc9bfa99254eda79392b6409a # Parent c0d5e0929f8b772ae00479ca6962216adc9c778b compat: drop compat layer for cleanupnodes We no longer support version lower than 4.3. diff -r c0d5e0929f8b -r 3680f715c14f hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Thu Apr 19 16:07:23 2018 +0200 +++ b/hgext3rd/topic/__init__.py Thu Apr 19 16:51:53 2018 +0200 @@ -885,7 +885,7 @@ # create obsmarkers and move bookmarks # XXX we should be creating marker as we go instead of only at the end, # this makes the operations more modulars - compat.cleanupnodes(repo, successors, 'changetopics') + scmutil.cleanupnodes(repo, successors, 'changetopics') # move the working copy too wctx = repo[None] diff -r c0d5e0929f8b -r 3680f715c14f hgext3rd/topic/compat.py --- a/hgext3rd/topic/compat.py Thu Apr 19 16:07:23 2018 +0200 +++ b/hgext3rd/topic/compat.py Thu Apr 19 16:51:53 2018 +0200 @@ -9,8 +9,6 @@ from mercurial import ( obsolete, - scmutil, - util, ) getmarkers = None @@ -33,15 +31,3 @@ ui.pager(cmd) except AttributeError: pass - -def cleanupnodes(repo, replacements, operation, moves=None): - # create obsmarkers and move bookmarks - # XXX we should be creating marker as we go instead of only at the end, - # this makes the operations more modulars - if util.safehasattr(scmutil, 'cleanupnodes'): - scmutil.cleanupnodes(repo, replacements, 'changetopics', - moves=moves) - else: - relations = [(repo[o], tuple(repo[n] for n in new)) - for (o, new) in replacements.iteritems()] - obsolete.createmarkers(repo, relations, operation=operation)