equal
deleted
inserted
replaced
2355 |
2355 |
2356 See pull for valid source format details. |
2356 See pull for valid source format details. |
2357 |
2357 |
2358 Returns 0 if there are incoming changes, 1 otherwise. |
2358 Returns 0 if there are incoming changes, 1 otherwise. |
2359 """ |
2359 """ |
2360 return hg.incoming(ui, repo, source, opts) |
2360 if opts.get('bundle') and opts.get('subrepos'): |
|
2361 raise util.Abort(_('cannot combine --bundle and --subrepos')) |
|
2362 |
|
2363 ret = hg.incoming(ui, repo, source, opts) |
|
2364 if opts.get('subrepos'): |
|
2365 ctx = repo[None] |
|
2366 for subpath in sorted(ctx.substate): |
|
2367 sub = ctx.sub(subpath) |
|
2368 ret = min(ret, sub.incoming(ui, source, opts)) |
|
2369 return ret |
2361 |
2370 |
2362 def init(ui, dest=".", **opts): |
2371 def init(ui, dest=".", **opts): |
2363 """create a new repository in the given directory |
2372 """create a new repository in the given directory |
2364 |
2373 |
2365 Initialize a new repository in the given directory. If the given |
2374 Initialize a new repository in the given directory. If the given |
4189 _('file to store the bundles into'), _('FILE')), |
4198 _('file to store the bundles into'), _('FILE')), |
4190 ('r', 'rev', [], |
4199 ('r', 'rev', [], |
4191 _('a remote changeset intended to be added'), _('REV')), |
4200 _('a remote changeset intended to be added'), _('REV')), |
4192 ('b', 'branch', [], |
4201 ('b', 'branch', [], |
4193 _('a specific branch you would like to pull'), _('BRANCH')), |
4202 _('a specific branch you would like to pull'), _('BRANCH')), |
4194 ] + logopts + remoteopts, |
4203 ] + logopts + remoteopts + subrepoopts, |
4195 _('[-p] [-n] [-M] [-f] [-r REV]...' |
4204 _('[-p] [-n] [-M] [-f] [-r REV]...' |
4196 ' [--bundle FILENAME] [SOURCE]')), |
4205 ' [--bundle FILENAME] [SOURCE]')), |
4197 "^init": |
4206 "^init": |
4198 (init, |
4207 (init, |
4199 remoteopts, |
4208 remoteopts, |