Show More
@@ -12,6 +12,7 b' from i18n import _' | |||||
12 | import config, util, node, error, cmdutil, bookmarks, match as matchmod |
|
12 | import config, util, node, error, cmdutil, bookmarks, match as matchmod | |
13 | import phases |
|
13 | import phases | |
14 | import pathutil |
|
14 | import pathutil | |
|
15 | import exchange | |||
15 | hg = None |
|
16 | hg = None | |
16 | propertycache = util.propertycache |
|
17 | propertycache = util.propertycache | |
17 |
|
18 | |||
@@ -817,11 +818,11 b' class hgsubrepo(abstractsubrepo):' | |||||
817 | self._repo.ui.status(_('pushing subrepo %s to %s\n') % |
|
818 | self._repo.ui.status(_('pushing subrepo %s to %s\n') % | |
818 | (subrelpath(self), dsturl)) |
|
819 | (subrelpath(self), dsturl)) | |
819 | other = hg.peer(self._repo, {'ssh': ssh}, dsturl) |
|
820 | other = hg.peer(self._repo, {'ssh': ssh}, dsturl) | |
820 |
res = self._repo |
|
821 | res = exchange.push(self._repo, other, force, newbranch=newbranch) | |
821 |
|
822 | |||
822 | # the repo is now clean |
|
823 | # the repo is now clean | |
823 | self._cachestorehash(dsturl) |
|
824 | self._cachestorehash(dsturl) | |
824 | return res |
|
825 | return res.cgresult | |
825 |
|
826 | |||
826 | @annotatesubrepoerror |
|
827 | @annotatesubrepoerror | |
827 | def outgoing(self, ui, dest, opts): |
|
828 | def outgoing(self, ui, dest, opts): |
General Comments 0
You need to be logged in to leave comments.
Login now