Mercurial > public > mercurial-scm > hg
comparison mercurial/subrepo.py @ 12272:42ecd56399d7
outgoing: recurse into subrepositories with --subrepos/-S flag
As with push, the optional destination path is ignored for the
subrepositories, i.e., they are always compared with their default
push path. Fixing this is Issue1852.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 13 Sep 2010 13:09:26 +0200 |
parents | 166b9866580a |
children | c02e1ed3d407 |
comparison
equal
deleted
inserted
replaced
12271:01dc8ba3e032 | 12272:42ecd56399d7 |
---|---|
262 return [], [], [], [], [], [], [] | 262 return [], [], [], [], [], [], [] |
263 | 263 |
264 def diff(self, diffopts, node2, match, prefix, **opts): | 264 def diff(self, diffopts, node2, match, prefix, **opts): |
265 pass | 265 pass |
266 | 266 |
267 def outgoing(self, ui, dest, opts): | |
268 return 1 | |
269 | |
267 class hgsubrepo(abstractsubrepo): | 270 class hgsubrepo(abstractsubrepo): |
268 def __init__(self, ctx, path, state): | 271 def __init__(self, ctx, path, state): |
269 self._path = path | 272 self._path = path |
270 self._state = state | 273 self._state = state |
271 r = ctx._repo | 274 r = ctx._repo |
391 dsturl = _abssource(self._repo, True) | 394 dsturl = _abssource(self._repo, True) |
392 self._repo.ui.status(_('pushing subrepo %s to %s\n') % | 395 self._repo.ui.status(_('pushing subrepo %s to %s\n') % |
393 (relpath(self), dsturl)) | 396 (relpath(self), dsturl)) |
394 other = hg.repository(self._repo.ui, dsturl) | 397 other = hg.repository(self._repo.ui, dsturl) |
395 return self._repo.push(other, force) | 398 return self._repo.push(other, force) |
399 | |
400 def outgoing(self, ui, dest, opts): | |
401 return hg.outgoing(ui, self._repo, _abssource(self._repo, True), opts) | |
396 | 402 |
397 class svnsubrepo(abstractsubrepo): | 403 class svnsubrepo(abstractsubrepo): |
398 def __init__(self, ctx, path, state): | 404 def __init__(self, ctx, path, state): |
399 self._path = path | 405 self._path = path |
400 self._state = state | 406 self._state = state |