tests/test-globalopts.t
author Manuel Jacob <me@manueljacob.de>
Thu, 15 Sep 2022 01:48:38 +0200
changeset 49494 c96ed4029fda
parent 48532 7ccd31fda132
child 49877 950c39918bd2
permissions -rw-r--r--
templates: add filter to reverse list The filter supports only lists because for lists, it’s straightforward to implement. Reversing text doesn’t seem very useful and is hard to implement. Reversing the bytes would break multi-bytes encodings. Reversing the code points would break characters consisting of multiple code points. Reversing graphemes is non-trivial without using a library not included in the standard library.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
     1
  $ hg init a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
     2
  $ cd a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
     3
  $ echo a > a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
     4
  $ hg ci -A -d'1 0' -m a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
     5
  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
     6
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
     7
  $ cd ..
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
     8
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
     9
  $ hg init b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    10
  $ cd b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    11
  $ echo b > b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    12
  $ hg ci -A -d'1 0' -m b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    13
  adding b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    14
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    15
  $ cd ..
7429
dbc40381620e tests: Skip tests if they will fail because of outer repo
Mads Kiilerich <mads@kiilerich.com>
parents: 6150
diff changeset
    16
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    17
  $ hg clone a c
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    18
  updating to branch default
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    19
  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
    20
  $ cd c
12637
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
    21
  $ cat >> .hg/hgrc <<EOF
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
    22
  > [paths]
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
    23
  > relative = ../a
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
    24
  > EOF
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    25
  $ hg pull -f ../b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    26
  pulling from ../b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    27
  searching for changes
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    28
  warning: repository is unrelated
13742
7abab875e647 discovery: avoid discovery when local graph is a subset of remote
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13368
diff changeset
    29
  requesting all changes
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    30
  adding changesets
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    31
  adding manifests
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    32
  adding file changes
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    33
  added 1 changesets with 1 changes to 1 files (+1 heads)
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34443
diff changeset
    34
  new changesets b6c483daf290
12194
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
47272
a671832a8e41 urlutil: move url "fixing" at the time of `ui.paths` initialization
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 47017
diff changeset
    75
  $ hg path | grep relativetohome
a671832a8e41 urlutil: move url "fixing" at the time of `ui.paths` initialization
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 47017
diff changeset
    76
  relativetohome = $TESTTMP/a
a671832a8e41 urlutil: move url "fixing" at the time of `ui.paths` initialization
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 47017
diff changeset
    77
  $ HOME=`pwd`/../ hg path | grep relativetohome
a671832a8e41 urlutil: move url "fixing" at the time of `ui.paths` initialization
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 47017
diff changeset
    78
  relativetohome = $TESTTMP/a
12637
42ca7aef28d3 dispatch: properly handle relative path aliases used with -R (issue2376)
Brodie Rao <brodie@bitheap.org>
parents: 12635
diff changeset
    79
  $ 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
    80
  8580ff50825a tip
12635
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
    81
  $ cd ..
45ef87f41f98 test-globalopts: test hg -R file:// and hg -R path-alias
Brodie Rao <brodie@bitheap.org>
parents: 12376
diff changeset
    82
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16933
diff changeset
    83
#if no-outer-repo
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16933
diff changeset
    84
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    85
Implicit -R:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    86
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    87
  $ hg ann a/a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    88
  0: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    89
  $ hg ann a/a a/a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    90
  0: a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    91
  $ hg ann a/a b/b
45906
95c4cca641f6 errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents: 43305
diff changeset
    92
  abort: no repository found in '$TESTTMP' (.hg not found)
45911
8939062597f0 errors: raise InputError on bad repo arguments
Martin von Zweigbergk <martinvonz@google.com>
parents: 45909
diff changeset
    93
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    94
  $ hg -R b ann a/a
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 35045
diff changeset
    95
  abort: a/a not under root '$TESTTMP/b'
25011
7d6a507a4c53 pathutil: hint if a path is root relative instead of cwd relative (issue4663)
Matt Harbison <matt_harbison@yahoo.com>
parents: 24364
diff changeset
    96
  (consider using '--cwd b')
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12194
diff changeset
    97
  [255]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
    98
  $ hg log
45906
95c4cca641f6 errors: remove trailing "!" from some error messages for consistency
Martin von Zweigbergk <martinvonz@google.com>
parents: 43305
diff changeset
    99
  abort: no repository found in '$TESTTMP' (.hg not found)
45911
8939062597f0 errors: raise InputError on bad repo arguments
Martin von Zweigbergk <martinvonz@google.com>
parents: 45909
diff changeset
   100
  [10]
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   101
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16933
diff changeset
   102
#endif
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16933
diff changeset
   103
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   104
Abbreviation of long option:
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
  $ hg --repo c tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   107
  changeset:   1:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   108
  tag:         tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   109
  parent:      -1:000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   110
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   111
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   112
  summary:     b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   113
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   114
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   115
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
   116
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   117
  $ hg --cwd a --cwd b --cwd c tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   118
  changeset:   1:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   119
  tag:         tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   120
  parent:      -1:000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   121
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   122
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   123
  summary:     b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   124
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   125
  $ hg --repo c --repository b -R a tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   126
  changeset:   0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   127
  tag:         tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   128
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   129
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   130
  summary:     a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   131
  
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   132
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   133
earlygetopt short option without following space:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   134
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   135
  $ hg -q -Rb tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   136
  0:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   137
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   138
earlygetopt with illegal abbreviations:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   139
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   140
  $ hg --confi "foo.bar=baz"
45909
ca39c45014fa errors: remove trailing "!" in messages about bad top-level args
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
   141
  abort: option --config may not be abbreviated
45918
ac565222b9f8 errors: raise InputError on bad top-level flags
Martin von Zweigbergk <martinvonz@google.com>
parents: 45911
diff changeset
   142
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   143
  $ hg --cw a tip
45909
ca39c45014fa errors: remove trailing "!" in messages about bad top-level args
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
   144
  abort: option --cwd may not be abbreviated
45918
ac565222b9f8 errors: raise InputError on bad top-level flags
Martin von Zweigbergk <martinvonz@google.com>
parents: 45911
diff changeset
   145
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   146
  $ hg --rep a tip
45909
ca39c45014fa errors: remove trailing "!" in messages about bad top-level args
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
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
45918
ac565222b9f8 errors: raise InputError on bad top-level flags
Martin von Zweigbergk <martinvonz@google.com>
parents: 45911
diff changeset
   148
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   149
  $ hg --repositor a tip
45909
ca39c45014fa errors: remove trailing "!" in messages about bad top-level args
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
   150
  abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
45918
ac565222b9f8 errors: raise InputError on bad top-level flags
Martin von Zweigbergk <martinvonz@google.com>
parents: 45911
diff changeset
   151
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   152
  $ hg -qR a tip
45909
ca39c45014fa errors: remove trailing "!" in messages about bad top-level args
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
   153
  abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
45918
ac565222b9f8 errors: raise InputError on bad top-level flags
Martin von Zweigbergk <martinvonz@google.com>
parents: 45911
diff changeset
   154
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   155
  $ hg -qRa tip
45909
ca39c45014fa errors: remove trailing "!" in messages about bad top-level args
Martin von Zweigbergk <martinvonz@google.com>
parents: 45906
diff changeset
   156
  abort: option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo
45918
ac565222b9f8 errors: raise InputError on bad top-level flags
Martin von Zweigbergk <martinvonz@google.com>
parents: 45911
diff changeset
   157
  [10]
12194
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
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
   160
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   161
  $ hg --cwd a parents
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   162
  changeset:   0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   163
  tag:         tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   164
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   165
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   166
  summary:     a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   167
  
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
Testing -y/--noninteractive - just be sure it is parsed:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   170
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   171
  $ hg --cwd a tip -q --noninteractive
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   172
  0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   173
  $ hg --cwd a tip -q -y
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
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   176
Testing -q/--quiet:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   177
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   178
  $ hg -R a -q tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   179
  0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   180
  $ hg -R b -q tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   181
  0:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   182
  $ hg -R c --quiet parents
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   183
  0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   184
  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
   185
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   186
Testing -v/--verbose:
6150
aafdea37f796 Infer a --repository argument from command arguments when reasonable.
Jesse Glick <jesse.glick@sun.com>
parents: 4734
diff changeset
   187
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   188
  $ hg --cwd c head -v
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   189
  changeset:   1:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   190
  tag:         tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   191
  parent:      -1:000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   192
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   193
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   194
  files:       b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   195
  description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   196
  b
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
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   199
  changeset:   0:8580ff50825a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   200
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   201
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   202
  files:       a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   203
  description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   204
  a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   205
  
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
  $ hg --cwd b tip --verbose
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   208
  changeset:   0:b6c483daf290
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   209
  tag:         tip
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   210
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   211
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   212
  files:       b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   213
  description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   214
  b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   215
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   216
  
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   217
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   218
Testing --config:
4728
7bb5bcb089e3 Added test for earlygetopt fixes (36d23de02da1 and 79cc512a34ed)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4365
diff changeset
   219
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   220
  $ 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
   221
  quuxfoo
46749
5a2212d40398 tests: Disable for rhg remaining tests that fail in that mode
Simon Sapin <simon.sapin@octobus.net>
parents: 46737
diff changeset
   222
TODO: add rhg support for detailed exit codes
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   223
  $ hg --cwd c --config '' tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   224
  abort: malformed --config option: '' (use --config section.name=value)
46118
db5dddb38f5b errors: raise InputError on early parse error in dispatch
Martin von Zweigbergk <martinvonz@google.com>
parents: 45918
diff changeset
   225
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   226
  $ hg --cwd c --config a.b tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   227
  abort: malformed --config option: 'a.b' (use --config section.name=value)
46118
db5dddb38f5b errors: raise InputError on early parse error in dispatch
Martin von Zweigbergk <martinvonz@google.com>
parents: 45918
diff changeset
   228
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   229
  $ hg --cwd c --config a tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   230
  abort: malformed --config option: 'a' (use --config section.name=value)
46118
db5dddb38f5b errors: raise InputError on early parse error in dispatch
Martin von Zweigbergk <martinvonz@google.com>
parents: 45918
diff changeset
   231
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   232
  $ hg --cwd c --config a.= tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   233
  abort: malformed --config option: 'a.=' (use --config section.name=value)
46118
db5dddb38f5b errors: raise InputError on early parse error in dispatch
Martin von Zweigbergk <martinvonz@google.com>
parents: 45918
diff changeset
   234
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   235
  $ hg --cwd c --config .b= tip -q
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   236
  abort: malformed --config option: '.b=' (use --config section.name=value)
46118
db5dddb38f5b errors: raise InputError on early parse error in dispatch
Martin von Zweigbergk <martinvonz@google.com>
parents: 45918
diff changeset
   237
  [10]
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   238
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   239
Testing --debug:
4728
7bb5bcb089e3 Added test for earlygetopt fixes (36d23de02da1 and 79cc512a34ed)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4365
diff changeset
   240
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   241
  $ hg --cwd c log --debug
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   242
  changeset:   1:b6c483daf2907ce5825c0bb50f5716226281cc1a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   243
  tag:         tip
22765
55dcc7fb731c log: do not hide the public phase in debug mode (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22501
diff changeset
   244
  phase:       public
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   245
  parent:      -1:0000000000000000000000000000000000000000
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
  manifest:    1:23226e7a252cacdc2d99e4fbdc3653441056de49
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   248
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   249
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   250
  files+:      b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   251
  extra:       branch=default
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   252
  description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   253
  b
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   254
  
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
  changeset:   0:8580ff50825a50c8f716709acdf8de0deddcd6ab
22765
55dcc7fb731c log: do not hide the public phase in debug mode (BC)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 22501
diff changeset
   257
  phase:       public
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   258
  parent:      -1:0000000000000000000000000000000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   259
  parent:      -1:0000000000000000000000000000000000000000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   260
  manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   261
  user:        test
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   262
  date:        Thu Jan 01 00:00:01 1970 +0000
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   263
  files+:      a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   264
  extra:       branch=default
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   265
  description:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   266
  a
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   267
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   268
  
2293
3dc6f2501dbc add --config global option. allows to set hgrc option on command line.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
   269
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   270
Testing --traceback:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   271
46737
e96a0a53de20 tests: Adapt expected output for minor differences with rhg
Simon Sapin <simon.sapin@octobus.net>
parents: 46368
diff changeset
   272
#if no-chg no-rhg
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   273
  $ 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
   274
  Traceback (most recent call last):
40263
8cf459d8b111 py3: use py3 as the test tag, dropping the k
Martijn Pieters <mj@octobus.net>
parents: 40224
diff changeset
   275
  Traceback (most recent call last): (py3 !)
34443
f2268edf38d5 test-globalopts: make the test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 31795
diff changeset
   276
#else
f2268edf38d5 test-globalopts: make the test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 31795
diff changeset
   277
Traceback for '--config' errors not supported with chg.
f2268edf38d5 test-globalopts: make the test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 31795
diff changeset
   278
  $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
f2268edf38d5 test-globalopts: make the test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 31795
diff changeset
   279
  [1]
f2268edf38d5 test-globalopts: make the test compatible with chg
Saurabh Singh <singhsrb@fb.com>
parents: 31795
diff changeset
   280
#endif
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   281
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   282
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
   283
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   284
  $ hg --cwd a --time id
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   285
  8580ff50825a tip
16933
30143c3dd102 dispatch: lowercase --time message
Martin Geisler <mg@aragost.com>
parents: 16547
diff changeset
   286
  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
   287
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   288
Testing --version:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   289
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   290
  $ hg --version -q
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
   291
  Mercurial Distributed SCM * (glob)
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   292
17014
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16933
diff changeset
   293
hide outer repo
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16933
diff changeset
   294
  $ hg init
50fbe9063ff2 tests: convert some 'hghave no-outer-repo' to #if
Mads Kiilerich <mads@kiilerich.com>
parents: 16933
diff changeset
   295
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   296
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
   297
37342
4e6a6d0dccee tests: conditionalize tests based on presence of custom extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents: 35393
diff changeset
   298
#if no-extraextensions
4e6a6d0dccee tests: conditionalize tests based on presence of custom extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents: 35393
diff changeset
   299
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   300
  $ hg -h
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   301
  Mercurial Distributed SCM
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   302
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   303
  list of commands:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   304
  
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   305
  Repository creation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   306
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   307
   clone         make a copy of an existing repository
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   308
   init          create a new repository in the given directory
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   309
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   310
  Remote repository management:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   311
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   312
   incoming      show new changesets found in source
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   313
   outgoing      show changesets not found in the destination
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   314
   paths         show aliases for remote repositories
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   315
   pull          pull changes from the specified source
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   316
   push          push changes to the specified destination
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   317
   serve         start stand-alone webserver
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   318
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   319
  Change creation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   320
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   321
   commit        commit the specified files or all outstanding changes
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   322
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   323
  Change manipulation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   324
  
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   325
   backout       reverse effect of earlier changeset
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   326
   graft         copy changes from other branches onto the current branch
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   327
   merge         merge another revision into working directory
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   328
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   329
  Change organization:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   330
  
21762
0c6cdbb697d9 bookmarks: improve the bookmark help (issue4244)
Matt Mackall <mpm@selenic.com>
parents: 20570
diff changeset
   331
   bookmarks     create a new bookmark or list existing bookmarks
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   332
   branch        set or show the current branch name
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   333
   branches      list repository named branches
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   334
   phase         set or show the current phase name
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   335
   tag           add one or more tags for the current or given revision
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   336
   tags          list repository tags
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   337
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   338
  File content management:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   339
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   340
   annotate      show changeset information by line for each file
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   341
   cat           output the current or given revision of files
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   342
   copy          mark files as copied for the next commit
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   343
   diff          diff repository (or selected files)
43305
d782cce137fd grep: update docs to reflect new --all-files default
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 42541
diff changeset
   344
   grep          search for a pattern in specified files
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   345
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   346
  Change navigation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   347
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   348
   bisect        subdivision search of changesets
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   349
   heads         show branch heads
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   350
   identify      identify the working directory or specified revision
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   351
   log           show revision history of entire repository or files
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   352
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   353
  Working directory management:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   354
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   355
   add           add the specified files on the next commit
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   356
   addremove     add all new files, delete all missing files
22423
edf07a804ac4 files: add new command unifying locate and manifest functionality
Matt Mackall <mpm@selenic.com>
parents: 22118
diff changeset
   357
   files         list tracked files
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   358
   forget        forget the specified files on the next commit
46368
bb3a5c0df06b purge: move extension into core mercurial
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 46118
diff changeset
   359
   purge         removes files not tracked by Mercurial
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   360
   remove        remove the specified files on the next commit
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   361
   rename        rename files; equivalent of copy + remove
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   362
   resolve       redo merges or set/view the merge status of files
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   363
   revert        restore files to their checkout state
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   364
   root          print the root (top) of the current working directory
42541
3de4f17f4824 shelve: move shelve extension to core
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 40294
diff changeset
   365
   shelve        save and set aside changes from the working directory
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   366
   status        show changed files in the working directory
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   367
   summary       summarize working directory state
42541
3de4f17f4824 shelve: move shelve extension to core
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 40294
diff changeset
   368
   unshelve      restore a shelved change to the working directory
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   369
   update        update working directory (or switch revisions)
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   370
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   371
  Change import/export:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   372
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   373
   archive       create an unversioned archive of a repository revision
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   374
   bundle        create a bundle file
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   375
   export        dump the header and diffs for one or more changesets
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   376
   import        import an ordered set of patches
31795
2b130e26c3a4 commands: update help for "unbundle"
Gregory Szorc <gregory.szorc@gmail.com>
parents: 31794
diff changeset
   377
   unbundle      apply one or more bundle files
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   378
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   379
  Repository maintenance:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   380
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   381
   manifest      output the current or given revision of the project manifest
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   382
   recover       roll back an interrupted transaction
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   383
   verify        verify the integrity of the repository
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   384
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   385
  Help:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   386
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   387
   config        show combined config settings from all hgrc files
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   388
   help          show help for a given topic or a help overview
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   389
   version       output version and copyright information
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   390
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   391
  additional help topics:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   392
  
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   393
  Mercurial identifiers:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   394
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   395
   filesets      Specifying File Sets
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   396
   hgignore      Syntax for Mercurial Ignore Files
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   397
   patterns      File Name Patterns
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   398
   revisions     Specifying Revisions
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   399
   urls          URL Paths
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   400
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   401
  Mercurial output:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   402
  
31129
71f692f1f678 color: update the help table
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 31061
diff changeset
   403
   color         Colorizing Outputs
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   404
   dates         Date Formats
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   405
   diffs         Diff Formats
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   406
   templating    Template Usage
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   407
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   408
  Mercurial configuration:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   409
  
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   410
   config        Configuration Files
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   411
   environment   Environment Variables
16547
23072be2eaa3 help: consistently use title capitalization for help topics
Martin Geisler <mg@aragost.com>
parents: 15996
diff changeset
   412
   extensions    Using Additional Features
35045
b0262b25ab48 help: adding a topic on flags
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents: 34661
diff changeset
   413
   flags         Command-line flags
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   414
   hgweb         Configuring hgweb
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   415
   merge-tools   Merge Tools
31061
900996da577a pager: move most help to a new help topic and deprecate extension
Augie Fackler <augie@google.com>
parents: 30769
diff changeset
   416
   pager         Pager Support
48532
7ccd31fda132 docs: add documentation about Rust
Raphaël Gomès <rgomes@octobus.net>
parents: 47408
diff changeset
   417
   rust          Rust in Mercurial
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   418
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   419
  Concepts:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   420
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   421
   bundlespec    Bundle File Formats
47017
da4e6d7a8fdd help: add topic about evolution, based on text from evolve extension
Martin von Zweigbergk <martinvonz@google.com>
parents: 46749
diff changeset
   422
   evolution     Safely rewriting history (EXPERIMENTAL)
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   423
   glossary      Glossary
15996
0455463655e0 help: add phases topic
Matt Mackall <mpm@selenic.com>
parents: 15862
diff changeset
   424
   phases        Working with Phases
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   425
   subrepos      Subrepositories
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   426
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   427
  Miscellaneous:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   428
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   429
   deprecated    Deprecated Features
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   430
   internals     Technical implementation topics
25881
9de443515f1d help: scripting help topic
Gregory Szorc <gregory.szorc@gmail.com>
parents: 25011
diff changeset
   431
   scripting     Using Mercurial from scripts and automation
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   432
  
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 27376
diff changeset
   433
  (use 'hg help -v' to show built-in 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
   434
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   435
  $ hg --help
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   436
  Mercurial Distributed SCM
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   437
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   438
  list of commands:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   439
  
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   440
  Repository creation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   441
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   442
   clone         make a copy of an existing repository
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   443
   init          create a new repository in the given directory
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   444
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   445
  Remote repository management:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   446
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   447
   incoming      show new changesets found in source
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   448
   outgoing      show changesets not found in the destination
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   449
   paths         show aliases for remote repositories
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   450
   pull          pull changes from the specified source
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   451
   push          push changes to the specified destination
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   452
   serve         start stand-alone webserver
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   453
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   454
  Change creation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   455
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   456
   commit        commit the specified files or all outstanding changes
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   457
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   458
  Change manipulation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   459
  
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   460
   backout       reverse effect of earlier changeset
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   461
   graft         copy changes from other branches onto the current branch
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   462
   merge         merge another revision into working directory
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   463
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   464
  Change organization:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   465
  
21762
0c6cdbb697d9 bookmarks: improve the bookmark help (issue4244)
Matt Mackall <mpm@selenic.com>
parents: 20570
diff changeset
   466
   bookmarks     create a new bookmark or list existing bookmarks
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   467
   branch        set or show the current branch name
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   468
   branches      list repository named branches
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   469
   phase         set or show the current phase name
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   470
   tag           add one or more tags for the current or given revision
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   471
   tags          list repository tags
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   472
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   473
  File content management:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   474
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   475
   annotate      show changeset information by line for each file
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   476
   cat           output the current or given revision of files
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   477
   copy          mark files as copied for the next commit
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   478
   diff          diff repository (or selected files)
43305
d782cce137fd grep: update docs to reflect new --all-files default
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents: 42541
diff changeset
   479
   grep          search for a pattern in specified files
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   480
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   481
  Change navigation:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   482
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   483
   bisect        subdivision search of changesets
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   484
   heads         show branch heads
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   485
   identify      identify the working directory or specified revision
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   486
   log           show revision history of entire repository or files
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   487
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   488
  Working directory management:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   489
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   490
   add           add the specified files on the next commit
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   491
   addremove     add all new files, delete all missing files
22423
edf07a804ac4 files: add new command unifying locate and manifest functionality
Matt Mackall <mpm@selenic.com>
parents: 22118
diff changeset
   492
   files         list tracked files
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   493
   forget        forget the specified files on the next commit
46368
bb3a5c0df06b purge: move extension into core mercurial
Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
parents: 46118
diff changeset
   494
   purge         removes files not tracked by Mercurial
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   495
   remove        remove the specified files on the next commit
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   496
   rename        rename files; equivalent of copy + remove
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   497
   resolve       redo merges or set/view the merge status of files
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   498
   revert        restore files to their checkout state
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   499
   root          print the root (top) of the current working directory
42541
3de4f17f4824 shelve: move shelve extension to core
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 40294
diff changeset
   500
   shelve        save and set aside changes from the working directory
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   501
   status        show changed files in the working directory
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   502
   summary       summarize working directory state
42541
3de4f17f4824 shelve: move shelve extension to core
Navaneeth Suresh <navaneeths1998@gmail.com>
parents: 40294
diff changeset
   503
   unshelve      restore a shelved change to the working directory
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   504
   update        update working directory (or switch revisions)
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   505
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   506
  Change import/export:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   507
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   508
   archive       create an unversioned archive of a repository revision
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   509
   bundle        create a bundle file
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   510
   export        dump the header and diffs for one or more changesets
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   511
   import        import an ordered set of patches
31795
2b130e26c3a4 commands: update help for "unbundle"
Gregory Szorc <gregory.szorc@gmail.com>
parents: 31794
diff changeset
   512
   unbundle      apply one or more bundle files
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   513
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   514
  Repository maintenance:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   515
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   516
   manifest      output the current or given revision of the project manifest
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   517
   recover       roll back an interrupted transaction
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   518
   verify        verify the integrity of the repository
40293
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   519
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   520
  Help:
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   521
  
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   522
   config        show combined config settings from all hgrc files
c303d65d2e34 help: assigning categories to existing commands
rdamazio@google.com
parents: 40263
diff changeset
   523
   help          show help for a given topic or a help overview
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   524
   version       output version and copyright information
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   525
  
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   526
  additional help topics:
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   527
  
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   528
  Mercurial identifiers:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   529
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   530
   filesets      Specifying File Sets
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   531
   hgignore      Syntax for Mercurial Ignore Files
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   532
   patterns      File Name Patterns
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   533
   revisions     Specifying Revisions
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   534
   urls          URL Paths
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   535
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   536
  Mercurial output:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   537
  
31129
71f692f1f678 color: update the help table
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 31061
diff changeset
   538
   color         Colorizing Outputs
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   539
   dates         Date Formats
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   540
   diffs         Diff Formats
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   541
   templating    Template Usage
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   542
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   543
  Mercurial configuration:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   544
  
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   545
   config        Configuration Files
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   546
   environment   Environment Variables
16547
23072be2eaa3 help: consistently use title capitalization for help topics
Martin Geisler <mg@aragost.com>
parents: 15996
diff changeset
   547
   extensions    Using Additional Features
35045
b0262b25ab48 help: adding a topic on flags
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents: 34661
diff changeset
   548
   flags         Command-line flags
15862
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   549
   hgweb         Configuring hgweb
d0f2a89c8cfa help: fix column alignment in "hg help" output
Olav Reinert <seroton10@gmail.com>
parents: 15830
diff changeset
   550
   merge-tools   Merge Tools
31061
900996da577a pager: move most help to a new help topic and deprecate extension
Augie Fackler <augie@google.com>
parents: 30769
diff changeset
   551
   pager         Pager Support
48532
7ccd31fda132 docs: add documentation about Rust
Raphaël Gomès <rgomes@octobus.net>
parents: 47408
diff changeset
   552
   rust          Rust in Mercurial
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   553
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   554
  Concepts:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   555
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   556
   bundlespec    Bundle File Formats
47017
da4e6d7a8fdd help: add topic about evolution, based on text from evolve extension
Martin von Zweigbergk <martinvonz@google.com>
parents: 46749
diff changeset
   557
   evolution     Safely rewriting history (EXPERIMENTAL)
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   558
   glossary      Glossary
15996
0455463655e0 help: add phases topic
Matt Mackall <mpm@selenic.com>
parents: 15862
diff changeset
   559
   phases        Working with Phases
40294
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   560
   subrepos      Subrepositories
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   561
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   562
  Miscellaneous:
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   563
  
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   564
   deprecated    Deprecated Features
fabbf9310025 help: assigning topic categories
Rodrigo Damazio <rdamazio@google.com>
parents: 40293
diff changeset
   565
   internals     Technical implementation topics
25881
9de443515f1d help: scripting help topic
Gregory Szorc <gregory.szorc@gmail.com>
parents: 25011
diff changeset
   566
   scripting     Using Mercurial from scripts and automation
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   567
  
29974
7109d5ddeb0c help: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 27376
diff changeset
   568
  (use 'hg help -v' to show built-in 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
   569
37342
4e6a6d0dccee tests: conditionalize tests based on presence of custom extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents: 35393
diff changeset
   570
#endif
4e6a6d0dccee tests: conditionalize tests based on presence of custom extensions
Gregory Szorc <gregory.szorc@gmail.com>
parents: 35393
diff changeset
   571
12194
9e40ea08c2ab tests: unify test-globalopts
Adrian Buehlmann <adrian@cadifra.com>
parents: 7429
diff changeset
   572
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
   573