comparison mercurial/commands.py @ 15708:309e49491253

push: propagate --new-branch and --ssh options when pushing subrepos Up until now the all the push command options were ignored when pushing subrepos. In particular, the fact that the --new-branch command was not passed down to subrepos made it not possible to push a repo when any of its subrepos had a new branch, even if you used the --new-branch option of the push command. In addition the error message was confusing since it showed the following hint: "--new-branch hint: use 'hg push --new-branch' to create new remote branches". However using the --new_branch flag did not fix the problem, as it was ignored when pushing subrepos. This patch passes the --new-branch and --ssh flags to every subrepo that is pushed. Issues/Limitations: - All subrepo types get these flags, but only the mercurial subrepos use them. - It is no longer possible to _not_ pass down these flags to subrepos when pushing: * An alternative would be to introduce a --subrepos flag that should be used to pass down these flags to the subrepos. * If we did this, it could make sense to make the --force flag respect this new --subrepos flag as well for consistency's sake. - Matt suggested that the ssh related flags could also be passed down to subrepos during pull and clone. However it seems that it would be the "update" command that would need to get those, since subrepos are only pulled on update. In any case I'd prefer to leave that for a later patch.
author Angel Ezquerra <angel.ezquerra@gmail.com>
date Thu, 29 Sep 2011 17:20:04 +0200
parents 43bb9c5ab963
children 9cf1620e1e75
comparison
equal deleted inserted replaced
15707:dc3eefe0c80e 15708:309e49491253
4360 try: 4360 try:
4361 # push subrepos depth-first for coherent ordering 4361 # push subrepos depth-first for coherent ordering
4362 c = repo[''] 4362 c = repo['']
4363 subs = c.substate # only repos that are committed 4363 subs = c.substate # only repos that are committed
4364 for s in sorted(subs): 4364 for s in sorted(subs):
4365 if not c.sub(s).push(opts.get('force')): 4365 if not c.sub(s).push(opts):
4366 return False 4366 return False
4367 finally: 4367 finally:
4368 del repo._subtoppath 4368 del repo._subtoppath
4369 result = repo.push(other, opts.get('force'), revs=revs, 4369 result = repo.push(other, opts.get('force'), revs=revs,
4370 newbranch=opts.get('new_branch')) 4370 newbranch=opts.get('new_branch'))