# HG changeset patch # User Pierre-Yves David # Date 2014-09-25 08:42:49 # Node ID f6cf96804d27e8e9c53c695d3d9632870ac9b236 # Parent ce95c15f680b746da98804de236b4f338f6590a2 push: `exchange.push` instead of `localrepo.push` The latter is going away. diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -12,6 +12,7 @@ from i18n import _ import config, util, node, error, cmdutil, bookmarks, match as matchmod import phases import pathutil +import exchange hg = None propertycache = util.propertycache @@ -817,11 +818,11 @@ class hgsubrepo(abstractsubrepo): self._repo.ui.status(_('pushing subrepo %s to %s\n') % (subrelpath(self), dsturl)) other = hg.peer(self._repo, {'ssh': ssh}, dsturl) - res = self._repo.push(other, force, newbranch=newbranch) + res = exchange.push(self._repo, other, force, newbranch=newbranch) # the repo is now clean self._cachestorehash(dsturl) - return res + return res.cgresult @annotatesubrepoerror def outgoing(self, ui, dest, opts):