Mercurial > hg
annotate tests/test-branch-option.t @ 14439:80c599eee3f3
dispatch: use the request to store the ui object
and check if we got one before creating.
note that the contents of the ui object might change after
dispatch() returns (by options passed through --config for example),
to ensure it doesn't, pass a copy() of it.
author | Idan Kamara <idankk86@gmail.com> |
---|---|
date | Thu, 26 May 2011 00:53:23 +0300 |
parents | 05fffd665170 |
children | 41885892796e |
rev | line source |
---|---|
11869
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
1 test branch selection options |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
2 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
3 $ hg init branch |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
4 $ cd branch |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
5 $ hg branch a |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
6 marked working directory as branch a |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
7 $ echo a > foo |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
8 $ hg ci -d '0 0' -Ama |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
9 adding foo |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
10 $ echo a2 > foo |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
11 $ hg ci -d '0 0' -ma2 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
12 $ hg up 0 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
14 $ hg branch c |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
15 marked working directory as branch c |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
16 $ echo c > foo |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
17 $ hg ci -d '0 0' -mc |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
18 $ hg tag -l z |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
19 $ cd .. |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
20 $ hg clone -r 0 branch branch2 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
21 adding changesets |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
22 adding manifests |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
23 adding file changes |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
24 added 1 changesets with 1 changes to 1 files |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
25 updating to branch a |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
27 $ cd branch2 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
28 $ hg up 0 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
29 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
30 $ hg branch b |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
31 marked working directory as branch b |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
32 $ echo b > foo |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
33 $ hg ci -d '0 0' -mb |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
34 $ hg up 0 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
36 $ hg --encoding utf-8 branch æ |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
37 marked working directory as branch \xc3\xa6 (esc) |
11869
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
38 $ echo ae1 > foo |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
39 $ hg ci -d '0 0' -mae1 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
40 $ hg up 0 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
41 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
42 $ hg --encoding utf-8 branch -f æ |
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
43 marked working directory as branch \xc3\xa6 (esc) |
11869
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
44 $ echo ae2 > foo |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
45 $ hg ci -d '0 0' -mae2 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
46 created new head |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
47 $ hg up 0 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
48 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
49 $ hg branch -f b |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
50 marked working directory as branch b |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
51 $ echo b2 > foo |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
52 $ hg ci -d '0 0' -mb2 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
53 created new head |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
54 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
55 unknown branch and fallback |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
56 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
57 $ hg in -qbz |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
58 abort: unknown branch 'z'! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11869
diff
changeset
|
59 [255] |
11869
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
60 $ hg in -q ../branch#z |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
61 2:f25d57ab0566 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
62 $ hg out -qbz |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
63 abort: unknown branch 'z'! |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11869
diff
changeset
|
64 [255] |
10365
d757bc0c7865
interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff
changeset
|
65 |
11869
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
66 in rev c branch a |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
67 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
68 $ hg in -qr c ../branch#a |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
69 1:dd6e60a716c6 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
70 2:f25d57ab0566 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
71 $ hg in -qr c -b a |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
72 1:dd6e60a716c6 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
73 2:f25d57ab0566 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
74 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
75 out branch . |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
76 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
77 $ hg out -q ../branch#. |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
78 1:b84708d77ab7 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
79 4:65511d0e2b55 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
80 $ hg out -q -b . |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
81 1:b84708d77ab7 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
82 4:65511d0e2b55 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
83 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
84 out branch . non-ascii |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
85 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
86 $ hg --encoding utf-8 up æ |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
88 $ hg --encoding latin1 out -q ../branch#. |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
89 2:df5a44224d4e |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
90 3:4f4a5125ca10 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
91 $ hg --encoding latin1 out -q -b . |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
92 2:df5a44224d4e |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
93 3:4f4a5125ca10 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
94 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
95 clone branch b |
10365
d757bc0c7865
interpret repo#name url syntax as branch instead of revision
Sune Foldager <cryo@cyanite.org>
parents:
diff
changeset
|
96 |
11869
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
97 $ cd .. |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
98 $ hg clone branch2#b branch3 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
99 adding changesets |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
100 adding manifests |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
101 adding file changes |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
102 added 3 changesets with 3 changes to 1 files (+1 heads) |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
103 updating to branch b |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
104 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
105 $ hg -q -R branch3 heads b |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
106 2:65511d0e2b55 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
107 1:b84708d77ab7 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
108 $ hg -q -R branch3 parents |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
109 2:65511d0e2b55 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
110 $ rm -rf branch3 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
111 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
112 clone rev a branch b |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
113 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
114 $ hg clone -r a branch2#b branch3 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
115 adding changesets |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
116 adding manifests |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
117 adding file changes |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
118 added 3 changesets with 3 changes to 1 files (+1 heads) |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
119 updating to branch a |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
121 $ hg -q -R branch3 heads b |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
122 2:65511d0e2b55 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
123 1:b84708d77ab7 |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
124 $ hg -q -R branch3 parents |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
125 0:5b65ba7c951d |
36a5e7cb6c8d
tests: unify test-branch-option
Martin Geisler <mg@lazybytes.net>
parents:
11322
diff
changeset
|
126 $ rm -rf branch3 |