compat: call current obsolete.createmarkers(), not one from load time
Other extensions may wrap obsolete.createmarkers(). If they do, we
should call their wrapped version. However, since f61a23a84dac
(compat: add wrapper for obsolete.createmarkers() that accepts
"operation" arg, 2018-03-16), we started storing the version of the
function as it was when our compat module was loaded. This broke an
extension we use internally at Google.
# Copyright 2017 FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""
Compatibility module
"""
from __future__ import absolute_import
import functools
from mercurial import (
obsolete,
scmutil,
util,
)
getmarkers = None
successorssets = None
try:
from mercurial import obsutil
getmarkers = getattr(obsutil, 'getmarkers', None)
successorssets = getattr(obsutil, 'successorssets', None)
except ImportError:
pass
if getmarkers is None:
getmarkers = obsolete.getmarkers
if successorssets is None:
successorssets = obsolete.successorssets
# Wrap obsolete.creatmarkers and make it accept but ignore "operation" argument
# for hg < 4.3
originalcreatemarkers = obsolete.createmarkers
while isinstance(originalcreatemarkers, functools.partial):
originalcreatemarkers = originalcreatemarkers.func
if originalcreatemarkers.__code__.co_argcount < 6:
def createmarkers(repo, relations, flag=0, date=None, metadata=None,
operation=None):
return obsolete.createmarkers(repo, relations, flag, date, metadata)
else:
def createmarkers(*args, **kwargs):
return obsolete.createmarkers(*args, **kwargs)
def startpager(ui, cmd):
"""function to start a pager in case ui.pager() exists"""
try:
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()]
createmarkers(repo, relations, operation=operation)