Mercurial > hg
annotate tests/test-inotify-issue1371.t @ 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 | 9965b90c7ed7 |
children | 4f8054d3171b |
rev | line source |
---|---|
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
1 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
2 $ "$TESTDIR/hghave" inotify || exit 80 |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
3 $ hg init |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
4 $ touch a b c d e f |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
5 $ echo "[extensions]" >> $HGRCPATH |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
6 $ echo "inotify=" >> $HGRCPATH |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
7 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
8 inserve |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
9 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
10 $ hg inserve -d --pid-file=hg.pid 2>&1 |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
11 $ cat hg.pid >> "$DAEMON_PIDS" |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
12 $ hg ci -Am m |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
13 adding a |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
14 adding b |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
15 adding c |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
16 adding d |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
17 adding e |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
18 adding f |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
19 adding hg.pid |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
20 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
21 let the daemon finish its stuff |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
22 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
23 $ sleep 1 |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
24 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
25 eed to test all file opperations |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
26 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
27 $ hg rm a |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
28 $ rm b |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
29 $ echo c >> c |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
30 $ touch g |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
31 $ hg add g |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
32 $ hg mv e h |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
33 $ hg status |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
34 M c |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
35 A g |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
36 A h |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
37 R a |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
38 R e |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
39 ! b |
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
40 $ sleep 1 |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
41 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
42 Are we able to kill the service? if not, the service died on some error |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
diff
changeset
|
43 |
12454
9965b90c7ed7
tests: unify test-inotify-issue1371
Matt Mackall <mpm@selenic.com>
parents:
7351
diff
changeset
|
44 $ kill `cat hg.pid` |