[PATCH 2 of 2] subrepo: subrepo does not get config from subparent repo (2/3)
Simon Heimberg
simohe at besonet.ch
Sat Jul 28 11:37:52 CDT 2012
# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1343492459 -7200
# Branch stable
# Node ID 951447a447e81de1126dbb733bbf2aa2c2d50221
# Parent 586d3bf61bd66bb7a504b08db3cc88f4160d45d9
subrepo: subrepo does not get config from subparent repo (2/3)
part two, pass repo instead of repo.ui to hg.peer
the failing lines in test-hook-subrepo.t go down from 4 to 1
diff -r 586d3bf61bd6 -r 951447a447e8 mercurial/subrepo.py
--- a/mercurial/subrepo.py Sam Jul 28 18:20:44 2012 +0200
+++ b/mercurial/subrepo.py Sam Jul 28 18:20:59 2012 +0200
@@ -562,7 +562,7 @@
dsturl = _abssource(self._repo, True)
self._repo.ui.status(_('pushing subrepo %s to %s\n') %
(subrelpath(self), dsturl))
- other = hg.peer(self._repo.ui, {'ssh': ssh}, dsturl)
+ other = hg.peer(self._repo, {'ssh': ssh}, dsturl)
return self._repo.push(other, force, newbranch=newbranch)
def outgoing(self, ui, dest, opts):
More information about the Mercurial-devel
mailing list