Mercurial > hg
view tests/test-commandserver.py.out @ 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 | e19302598df8 |
children | 8ed112ed774a |
line wrap: on
line source
testing hellomessage: o, 'capabilities: getencoding runcommand\nencoding: ***' runcommand id 000000000000 tip abort: unknown command unknowncommand testing unknowncommand: testing checkruncommand: runcommand Mercurial Distributed SCM basic commands: add add the specified files on the next commit annotate show changeset information by line for each file clone make a copy of an existing repository commit commit the specified files or all outstanding changes diff diff repository (or selected files) export dump the header and diffs for one or more changesets forget forget the specified files on the next commit init create a new repository in the given directory log show revision history of entire repository or files merge merge working directory with another revision pull pull changes from the specified source push push changes to the specified destination remove remove the specified files on the next commit serve start stand-alone webserver status show changed files in the working directory summary summarize working directory state update update working directory (or switch revisions) use "hg help" for the full list of commands or "hg -v" for details runcommand id --quiet 000000000000 runcommand id 000000000000 tip runcommand id --config ui.quiet=True 000000000000 runcommand id 000000000000 tip testing inputeof: server exit code = 1 testing serverinput: runcommand import - applying patch from stdin runcommand log changeset: 0:eff892de26ec tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 1 testing cwd: runcommand --cwd foo st bar ? bar runcommand st foo/bar ? foo/bar testing localhgrc: runcommand showconfig bundle.mainreporoot=$TESTTMP defaults.backout=-d "0 0" defaults.commit=-d "0 0" defaults.tag=-d "0 0" ui.slash=True ui.foo=bar runcommand init foo runcommand -R foo showconfig ui defaults defaults.backout=-d "0 0" defaults.commit=-d "0 0" defaults.tag=-d "0 0" ui.slash=True testing hookoutput: runcommand --config hooks.pre-identify=python:test-commandserver.hook id hook talking now try to read something: 'some input' eff892de26ec tip testing outsidechanges: runcommand tip changeset: 1:d3a0a68be6de tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: 2 testing bookmarks: runcommand bookmarks no bookmarks set runcommand bookmarks bm1 1:d3a0a68be6de bm2 1:d3a0a68be6de runcommand bookmarks * bm1 1:d3a0a68be6de bm2 1:d3a0a68be6de testing tagscache: runcommand id -t -r 0 runcommand id -t -r 0 foo