diff --git a/hgext3rd/backups.py b/hgext3rd/backups.py --- a/hgext3rd/backups.py +++ b/hgext3rd/backups.py @@ -18,6 +18,7 @@ from mercurial import bundle2, registrar from mercurial import lock as lockmod from mercurial import pycompat +from mercurial import util from hgext import pager from mercurial.node import nullid, short from mercurial.i18n import _ @@ -63,8 +64,18 @@ opts['bundle'] = '' opts['force'] = None + if util.safehasattr(cmdutil, 'loglimit'): + # legacy case + loglimit = cmdutil.loglimit + show_changeset = cmdutil.show_changeset + else: + # since core commit c8e2d6ed1f9e + from mercurial import logcmdutil + loglimit = logcmdutil.getlimit + show_changeset = logcmdutil.changesetdisplayer + def display(other, chlist, displayer): - limit = cmdutil.loglimit(opts) + limit = loglimit(opts) if opts.get('newest_first'): chlist.reverse() count = 0 @@ -147,7 +158,7 @@ opts['template'] = verbosetemplate else: ui.status("%s%s\n" % ("bundle:".ljust(13), source)) - displayer = cmdutil.show_changeset(ui, other, opts, False) + displayer = show_changeset(ui, other, opts, False) display(other, chlist, displayer) displayer.close() finally: