annotate tests/test-globalopts.t @ 12724:66e7ba85585b

test-url: remove trailing whitespace
author Augie Fackler <durin42@gmail.com>
date Tue, 12 Oct 2010 11:02:05 -0500
parents 42ca7aef28d3
children e8a8993b625e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
1 $ "$TESTDIR/hghave" no-outer-repo || exit 80
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
2
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
3 $ hg init a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
4 $ cd a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
5 $ echo a > a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
6 $ hg ci -A -d'1 0' -m a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
7 adding a
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
8
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
9 $ cd ..
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
10
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
11 $ hg init b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
12 $ cd b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
13 $ echo b > b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
14 $ hg ci -A -d'1 0' -m b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
15 adding b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
16
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
17 $ cd ..
7429
dbc40381620e tests: Skip tests if they will fail because of outer repo
Mads Kiilerich <mads@kiilerich.com>
parents: 6150
diff changeset
18
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
19 $ hg clone a c
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
20 updating to branch default
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
22 $ cd c
12637
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
23 $ cat >> .hg/hgrc <<EOF
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
24 > [paths]
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
25 > relative = ../a
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
26 > EOF
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
27 $ hg pull -f ../b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
28 pulling from ../b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
29 searching for changes
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
30 warning: repository is unrelated
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
31 adding changesets
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
32 adding manifests
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
33 adding file changes
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
34 added 1 changesets with 1 changes to 1 files (+1 heads)
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
35 (run 'hg heads' to see heads, 'hg merge' to merge)
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
36 $ hg merge
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
37 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
38 (branch merge, don't forget to commit)
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
39
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
40 $ cd ..
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
41
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
42 Testing -R/--repository:
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
43
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
44 $ hg -R a tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
45 changeset: 0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
46 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
47 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
48 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
49 summary: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
50
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
51 $ hg --repository b tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
52 changeset: 0:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
53 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
54 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
55 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
56 summary: b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
57
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
58
12635
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
59 -R with a URL:
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
60
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
61 $ hg -R file:a identify
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
62 8580ff50825a tip
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
63 $ hg -R file://localhost/`pwd`/a/ identify
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
64 8580ff50825a tip
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
65
12637
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
66 -R with path aliases:
12635
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
67
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
68 $ cd c
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
69 $ hg -R default identify
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
70 8580ff50825a tip
12637
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
71 $ hg -R relative identify
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
72 8580ff50825a tip
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
73 $ echo '[paths]' >> $HGRCPATH
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
74 $ echo 'relativetohome = a' >> $HGRCPATH
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
75 $ HOME=`pwd`/../ hg -R relativetohome identify
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
76 8580ff50825a tip
12635
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
77 $ cd ..
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
78
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
79 Implicit -R:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
80
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
81 $ hg ann a/a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
82 0: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
83 $ hg ann a/a a/a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
84 0: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
85 $ hg ann a/a b/b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
86 abort: There is no Mercurial repository here (.hg not found)!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
87 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
88 $ hg -R b ann a/a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
89 abort: a/a not under root
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
90 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
91 $ hg log
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
92 abort: There is no Mercurial repository here (.hg not found)!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
93 [255]
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
94
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
95 Abbreviation of long option:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
96
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
97 $ hg --repo c tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
98 changeset: 1:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
99 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
100 parent: -1:000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
101 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
102 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
103 summary: b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
104
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
105
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
106 earlygetopt with duplicate options (36d23de02da1):
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
107
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
108 $ hg --cwd a --cwd b --cwd c tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
109 changeset: 1:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
110 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
111 parent: -1:000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
112 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
113 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
114 summary: b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
115
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
116 $ hg --repo c --repository b -R a tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
117 changeset: 0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
118 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
119 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
120 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
121 summary: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
122
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
123
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
124 earlygetopt short option without following space:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
125
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
126 $ hg -q -Rb tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
127 0:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
128
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
129 earlygetopt with illegal abbreviations:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
130
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
131 $ hg --confi "foo.bar=baz"
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
132 abort: option --config may not be abbreviated!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
133 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
134 $ hg --cw a tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
135 abort: option --cwd may not be abbreviated!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
136 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
137 $ hg --rep a tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
138 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
139 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
140 $ hg --repositor a tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
141 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
142 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
143 $ hg -qR a tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
144 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
145 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
146 $ hg -qRa tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
147 abort: Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
148 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
149
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
150 Testing --cwd:
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
151
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
152 $ hg --cwd a parents
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
153 changeset: 0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
154 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
155 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
156 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
157 summary: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
158
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
159
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
160 Testing -y/--noninteractive - just be sure it is parsed:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
161
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
162 $ hg --cwd a tip -q --noninteractive
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
163 0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
164 $ hg --cwd a tip -q -y
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
165 0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
166
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
167 Testing -q/--quiet:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
168
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
169 $ hg -R a -q tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
170 0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
171 $ hg -R b -q tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
172 0:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
173 $ hg -R c --quiet parents
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
174 0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
175 1:b6c483daf290
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
176
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
177 Testing -v/--verbose:
6150
aafdea37f796 Infer a --repository argument from command arguments when reasonable.
Jesse Glick <jesse.glick@sun.com>
parents: 4734
diff changeset
178
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
179 $ hg --cwd c head -v
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
180 changeset: 1:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
181 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
182 parent: -1:000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
183 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
184 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
185 files: b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
186 description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
187 b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
188
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
189
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
190 changeset: 0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
191 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
192 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
193 files: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
194 description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
195 a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
196
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
197
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
198 $ hg --cwd b tip --verbose
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
199 changeset: 0:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
200 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
201 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
202 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
203 files: b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
204 description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
205 b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
206
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
207
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
208
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
209 Testing --config:
4728
7bb5bcb089e3 Added test for earlygetopt fixes (36d23de02da1 and 79cc512a34ed)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4365
diff changeset
210
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
211 $ hg --cwd c --config paths.quuxfoo=bar paths | grep quuxfoo > /dev/null && echo quuxfoo
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
212 quuxfoo
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
213 $ hg --cwd c --config '' tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
214 abort: malformed --config option: '' (use --config section.name=value)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
215 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
216 $ hg --cwd c --config a.b tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
217 abort: malformed --config option: 'a.b' (use --config section.name=value)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
218 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
219 $ hg --cwd c --config a tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
220 abort: malformed --config option: 'a' (use --config section.name=value)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
221 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
222 $ hg --cwd c --config a.= tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
223 abort: malformed --config option: 'a.=' (use --config section.name=value)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
224 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
225 $ hg --cwd c --config .b= tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
226 abort: malformed --config option: '.b=' (use --config section.name=value)
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
227 [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
228
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
229 Testing --debug:
4728
7bb5bcb089e3 Added test for earlygetopt fixes (36d23de02da1 and 79cc512a34ed)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4365
diff changeset
230
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
231 $ hg --cwd c log --debug
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
232 changeset: 1:b6c483daf2907ce5825c0bb50f5716226281cc1a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
233 tag: tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
234 parent: -1:0000000000000000000000000000000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
235 parent: -1:0000000000000000000000000000000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
236 manifest: 1:23226e7a252cacdc2d99e4fbdc3653441056de49
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
237 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
238 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
239 files+: b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
240 extra: branch=default
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
241 description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
242 b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
243
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
244
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
245 changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
246 parent: -1:0000000000000000000000000000000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
247 parent: -1:0000000000000000000000000000000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
248 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
249 user: test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
250 date: Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
251 files+: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
252 extra: branch=default
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
253 description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
254 a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
255
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
256
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
257
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
258 Testing --traceback:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
259
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
260 $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
261 Traceback (most recent call last):
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
262
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
263 Testing --time:
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
264
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
265 $ hg --cwd a --time id
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
266 8580ff50825a tip
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
267 Time: real * (glob)
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
268
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
269 Testing --version:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
270
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
271 $ hg --version -q
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
272 Mercurial Distributed SCM * (glob)
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
273
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
274 Testing -h/--help:
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
275
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
276 $ hg -h
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
277 Mercurial Distributed SCM
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
278
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
279 list of commands:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
280
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
281 add add the specified files on the next commit
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
282 addremove add all new files, delete all missing files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
283 annotate show changeset information by line for each file
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
284 archive create an unversioned archive of a repository revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
285 backout reverse effect of earlier changeset
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
286 bisect subdivision search of changesets
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
287 branch set or show the current branch name
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
288 branches list repository named branches
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
289 bundle create a changegroup file
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
290 cat output the current or given revision of files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
291 clone make a copy of an existing repository
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
292 commit commit the specified files or all outstanding changes
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
293 copy mark files as copied for the next commit
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
294 diff diff repository (or selected files)
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
295 export dump the header and diffs for one or more changesets
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
296 forget forget the specified files on the next commit
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
297 grep search for a pattern in specified files and revisions
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
298 heads show current repository heads or show branch heads
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
299 help show help for a given topic or a help overview
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
300 identify identify the working copy or specified revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
301 import import an ordered set of patches
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
302 incoming show new changesets found in source
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
303 init create a new repository in the given directory
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
304 locate locate files matching specific patterns
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
305 log show revision history of entire repository or files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
306 manifest output the current or given revision of the project manifest
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
307 merge merge working directory with another revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
308 outgoing show changesets not found in the destination
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
309 parents show the parents of the working directory or revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
310 paths show aliases for remote repositories
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
311 pull pull changes from the specified source
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
312 push push changes to the specified destination
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
313 recover roll back an interrupted transaction
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
314 remove remove the specified files on the next commit
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
315 rename rename files; equivalent of copy + remove
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
316 resolve redo merges or set/view the merge status of files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
317 revert restore individual files or directories to an earlier state
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
318 rollback roll back the last transaction (dangerous)
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
319 root print the root (top) of the current working directory
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
320 serve start stand-alone webserver
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
321 showconfig show combined config settings from all hgrc files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
322 status show changed files in the working directory
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
323 summary summarize working directory state
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
324 tag add one or more tags for the current or given revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
325 tags list repository tags
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
326 tip show the tip revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
327 unbundle apply one or more changegroup files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
328 update update working directory (or switch revisions)
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
329 verify verify the integrity of the repository
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
330 version output version and copyright information
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
331
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
332 additional help topics:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
333
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
334 config Configuration Files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
335 dates Date Formats
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
336 patterns File Name Patterns
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
337 environment Environment Variables
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
338 revisions Specifying Single Revisions
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
339 multirevs Specifying Multiple Revisions
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
340 revsets Specifying Revision Sets
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
341 diffs Diff Formats
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
342 templating Template Usage
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
343 urls URL Paths
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
344 extensions Using additional features
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
345 hgweb Configuring hgweb
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
346 glossary Glossary
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
347
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
348 use "hg -v help" to show aliases and global options
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
349
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
350 $ hg --help
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
351 Mercurial Distributed SCM
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
352
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
353 list of commands:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
354
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
355 add add the specified files on the next commit
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
356 addremove add all new files, delete all missing files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
357 annotate show changeset information by line for each file
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
358 archive create an unversioned archive of a repository revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
359 backout reverse effect of earlier changeset
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
360 bisect subdivision search of changesets
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
361 branch set or show the current branch name
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
362 branches list repository named branches
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
363 bundle create a changegroup file
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
364 cat output the current or given revision of files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
365 clone make a copy of an existing repository
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
366 commit commit the specified files or all outstanding changes
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
367 copy mark files as copied for the next commit
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
368 diff diff repository (or selected files)
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
369 export dump the header and diffs for one or more changesets
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
370 forget forget the specified files on the next commit
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
371 grep search for a pattern in specified files and revisions
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
372 heads show current repository heads or show branch heads
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
373 help show help for a given topic or a help overview
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
374 identify identify the working copy or specified revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
375 import import an ordered set of patches
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
376 incoming show new changesets found in source
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
377 init create a new repository in the given directory
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
378 locate locate files matching specific patterns
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
379 log show revision history of entire repository or files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
380 manifest output the current or given revision of the project manifest
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
381 merge merge working directory with another revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
382 outgoing show changesets not found in the destination
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
383 parents show the parents of the working directory or revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
384 paths show aliases for remote repositories
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
385 pull pull changes from the specified source
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
386 push push changes to the specified destination
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
387 recover roll back an interrupted transaction
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
388 remove remove the specified files on the next commit
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
389 rename rename files; equivalent of copy + remove
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
390 resolve redo merges or set/view the merge status of files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
391 revert restore individual files or directories to an earlier state
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
392 rollback roll back the last transaction (dangerous)
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
393 root print the root (top) of the current working directory
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
394 serve start stand-alone webserver
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
395 showconfig show combined config settings from all hgrc files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
396 status show changed files in the working directory
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
397 summary summarize working directory state
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
398 tag add one or more tags for the current or given revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
399 tags list repository tags
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
400 tip show the tip revision
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
401 unbundle apply one or more changegroup files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
402 update update working directory (or switch revisions)
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
403 verify verify the integrity of the repository
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
404 version output version and copyright information
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
405
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
406 additional help topics:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
407
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
408 config Configuration Files
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
409 dates Date Formats
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
410 patterns File Name Patterns
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
411 environment Environment Variables
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
412 revisions Specifying Single Revisions
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
413 multirevs Specifying Multiple Revisions
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
414 revsets Specifying Revision Sets
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
415 diffs Diff Formats
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
416 templating Template Usage
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
417 urls URL Paths
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
418 extensions Using additional features
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
419 hgweb Configuring hgweb
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
420 glossary Glossary
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
421
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
422 use "hg -v help" to show aliases and global options
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
423
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
424 Not tested: --debugger
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
425