Mercurial > hg
comparison mercurial/subrepo.py @ 11078:37d1b20168d1
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 01 May 2010 15:15:35 -0500 |
parents | 8d5f5122a732 49e14ec67144 |
children | a2bc2f2d77a9 |
comparison
equal
deleted
inserted
replaced
11077:132d783d6a87 | 11078:37d1b20168d1 |
---|---|
257 def push(self, force): | 257 def push(self, force): |
258 # push subrepos depth-first for coherent ordering | 258 # push subrepos depth-first for coherent ordering |
259 c = self._repo[''] | 259 c = self._repo[''] |
260 subs = c.substate # only repos that are committed | 260 subs = c.substate # only repos that are committed |
261 for s in sorted(subs): | 261 for s in sorted(subs): |
262 c.sub(s).push(force) | 262 if not c.sub(s).push(force): |
263 return False | |
263 | 264 |
264 self._repo.ui.status(_('pushing subrepo %s\n') % self._path) | 265 self._repo.ui.status(_('pushing subrepo %s\n') % self._path) |
265 dsturl = _abssource(self._repo, True) | 266 dsturl = _abssource(self._repo, True) |
266 other = hg.repository(self._repo.ui, dsturl) | 267 other = hg.repository(self._repo.ui, dsturl) |
267 self._repo.push(other, force) | 268 return self._repo.push(other, force) |
268 | 269 |
269 class svnsubrepo(object): | 270 class svnsubrepo(object): |
270 def __init__(self, ctx, path, state): | 271 def __init__(self, ctx, path, state): |
271 self._path = path | 272 self._path = path |
272 self._state = state | 273 self._state = state |