tests/test-help.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 22 Aug 2006 16:03:55 -0700
changeset 3006 7017fc9a9478
parent 2956 6dddcba7596a
child 3181 3637d5d17cbc
permissions -rw-r--r--
MQ: Make more commands return meaningful errors.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     1
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     2
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     3
basic commands (use "hg help" for the full list or option "-v" for details):
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     4
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     5
 add        add the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     6
 annotate   show changeset information per file line
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     7
 clone      make a copy of an existing repository
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     8
 commit     commit the specified files or all outstanding changes
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
     9
 diff       diff repository (or selected files)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    10
 export     dump the header and diffs for one or more changesets
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
    11
 init       create a new repository in the given directory
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
    12
 log        show revision history of entire repository or files
1475
d791c335fb7b Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com>
parents: 1437
diff changeset
    13
 parents    show the parents of the working dir or revision
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    14
 pull       pull changes from the specified source
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    15
 push       push changes to the specified destination
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    16
 remove     remove the specified files on the next commit
2226
abfed2a82b07 fix test-help output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2217
diff changeset
    17
 revert     revert files or dirs to their states as of some revision
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    18
 serve      export the repository via HTTP
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    19
 status     show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    20
 update     update or merge working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    21
 add        add the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    22
 annotate   show changeset information per file line
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    23
 clone      make a copy of an existing repository
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    24
 commit     commit the specified files or all outstanding changes
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
    25
 diff       diff repository (or selected files)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    26
 export     dump the header and diffs for one or more changesets
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
    27
 init       create a new repository in the given directory
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
    28
 log        show revision history of entire repository or files
1475
d791c335fb7b Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com>
parents: 1437
diff changeset
    29
 parents    show the parents of the working dir or revision
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    30
 pull       pull changes from the specified source
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    31
 push       push changes to the specified destination
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    32
 remove     remove the specified files on the next commit
2226
abfed2a82b07 fix test-help output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2217
diff changeset
    33
 revert     revert files or dirs to their states as of some revision
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    34
 serve      export the repository via HTTP
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    35
 status     show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    36
 update     update or merge working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    37
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    38
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    39
list of commands (use "hg help -v" to show aliases and global options):
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    40
2955
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    41
 add         add the specified files on the next commit
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    42
 addremove   add all new files, delete all missing files (DEPRECATED)
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    43
 annotate    show changeset information per file line
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    44
 archive     create unversioned archive of a repository revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    45
 backout     reverse effect of earlier changeset
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    46
 bundle      create a changegroup file
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    47
 cat         output the latest or given revisions of files
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    48
 clone       make a copy of an existing repository
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    49
 commit      commit the specified files or all outstanding changes
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    50
 copy        mark files as copied for the next commit
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    51
 diff        diff repository (or selected files)
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    52
 export      dump the header and diffs for one or more changesets
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    53
 grep        search for a pattern in specified files and revisions
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    54
 heads       show current repository heads
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    55
 help        show help for a command, extension, or list of commands
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    56
 identify    print information about the working copy
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    57
 import      import an ordered set of patches
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    58
 incoming    show new changesets found in source
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    59
 init        create a new repository in the given directory
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    60
 locate      locate files matching specific patterns
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    61
 log         show revision history of entire repository or files
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    62
 manifest    output the latest or given revision of the project manifest
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    63
 merge       Merge working directory with another revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    64
 outgoing    show changesets not found in destination
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    65
 parents     show the parents of the working dir or revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    66
 paths       show definition of symbolic path names
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    67
 pull        pull changes from the specified source
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    68
 push        push changes to the specified destination
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    69
 recover     roll back an interrupted transaction
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    70
 remove      remove the specified files on the next commit
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    71
 rename      rename files; equivalent of copy + remove
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    72
 revert      revert files or dirs to their states as of some revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    73
 rollback    roll back the last transaction in this repository
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    74
 root        print the root (top) of the current working dir
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    75
 serve       export the repository via HTTP
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    76
 status      show changed files in the working directory
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    77
 tag         add a tag for the current tip or a given revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    78
 tags        list repository tags
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    79
 tip         show the tip revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    80
 unbundle    apply a changegroup file
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    81
 update      update or merge working directory
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    82
 verify      verify the integrity of the repository
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    83
 version     output version and copyright information
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    84
 add         add the specified files on the next commit
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    85
 addremove   add all new files, delete all missing files (DEPRECATED)
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    86
 annotate    show changeset information per file line
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    87
 archive     create unversioned archive of a repository revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    88
 backout     reverse effect of earlier changeset
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    89
 bundle      create a changegroup file
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    90
 cat         output the latest or given revisions of files
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    91
 clone       make a copy of an existing repository
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    92
 commit      commit the specified files or all outstanding changes
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    93
 copy        mark files as copied for the next commit
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    94
 diff        diff repository (or selected files)
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    95
 export      dump the header and diffs for one or more changesets
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    96
 grep        search for a pattern in specified files and revisions
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    97
 heads       show current repository heads
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    98
 help        show help for a command, extension, or list of commands
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
    99
 identify    print information about the working copy
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   100
 import      import an ordered set of patches
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   101
 incoming    show new changesets found in source
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   102
 init        create a new repository in the given directory
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   103
 locate      locate files matching specific patterns
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   104
 log         show revision history of entire repository or files
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   105
 manifest    output the latest or given revision of the project manifest
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   106
 merge       Merge working directory with another revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   107
 outgoing    show changesets not found in destination
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   108
 parents     show the parents of the working dir or revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   109
 paths       show definition of symbolic path names
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   110
 pull        pull changes from the specified source
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   111
 push        push changes to the specified destination
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   112
 recover     roll back an interrupted transaction
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   113
 remove      remove the specified files on the next commit
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   114
 rename      rename files; equivalent of copy + remove
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   115
 revert      revert files or dirs to their states as of some revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   116
 rollback    roll back the last transaction in this repository
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   117
 root        print the root (top) of the current working dir
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   118
 serve       export the repository via HTTP
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   119
 status      show changed files in the working directory
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   120
 tag         add a tag for the current tip or a given revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   121
 tags        list repository tags
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   122
 tip         show the tip revision
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   123
 unbundle    apply a changegroup file
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   124
 update      update or merge working directory
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   125
 verify      verify the integrity of the repository
9d1c3529ebbc addremove: do not deprecate.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   126
 version     output version and copyright information
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   127
hg add [OPTION]... [FILE]...
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   128
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   129
add the specified files on the next commit
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   130
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   131
    Schedule files to be version controlled and added to the repository.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   132
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   133
    The files will be added to the repository at the next commit.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   134
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   135
    If no names are given, add all files in the repository.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   136
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   137
options:
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   138
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   139
 -I --include  include names matching the given patterns
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   140
 -X --exclude  exclude names matching the given patterns
2418
99835097bca9 update test-help output after new options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2241
diff changeset
   141
 -n --dry-run  do not perform actions, just print output
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   142
hg add: option --skjdfks not recognized
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   143
hg add [OPTION]... [FILE]...
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   144
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   145
add the specified files on the next commit
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   146
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   147
    Schedule files to be version controlled and added to the repository.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   148
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   149
    The files will be added to the repository at the next commit.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   150
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   151
    If no names are given, add all files in the repository.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   152
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   153
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   154
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   155
 -I --include  include names matching the given patterns
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   156
 -X --exclude  exclude names matching the given patterns
2418
99835097bca9 update test-help output after new options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2241
diff changeset
   157
 -n --dry-run  do not perform actions, just print output
1055
ea465485f54f Minor test-help fix
mpm@selenic.com
parents: 1052
diff changeset
   158
hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   159
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   160
diff repository (or selected files)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   161
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   162
    Show differences between revisions for the specified files.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   163
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   164
    Differences between files are shown using the unified diff format.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   165
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   166
    When two revision arguments are given, then changes are shown
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   167
    between those revisions. If only one revision is specified then
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   168
    that revision is compared to the working directory, and, when no
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   169
    revisions are specified, the working directory files are compared
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   170
    to its parent.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   171
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   172
    Without the -a option, diff will avoid generating diffs of files
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   173
    it detects as binary. With -a, diff will generate a diff anyway,
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   174
    probably with undesirable results.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   175
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   176
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   177
2580
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
   178
 -r --rev                  revision
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
   179
 -a --text                 treat all files as text
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
   180
 -p --show-function        show which function each change is in
2907
8b02af865990 Add diff --git option
Brendan Cully <brendan@kublai.com>
parents: 2661
diff changeset
   181
 -g --git                  use git extended diff format
2580
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
   182
 -w --ignore-all-space     ignore white space when comparing lines
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
   183
 -b --ignore-space-change  ignore changes in the amount of white space
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
   184
 -B --ignore-blank-lines   ignore changes whose lines are all blank
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
   185
 -I --include              include names matching the given patterns
a20a1bb0c396 diff: add -b/-B options
Haakon Riiser <haakon.riiser@fys.uio.no>
parents: 2553
diff changeset
   186
 -X --exclude              exclude names matching the given patterns
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   187
hg status [OPTION]... [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   188
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   189
show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   190
2661
5c10b7ed3411 status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   191
    Show status of files in the repository.  If names are given, only
5c10b7ed3411 status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   192
    files that match are shown.  Files that are clean or ignored, are
5c10b7ed3411 status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   193
    not listed unless -c (clean), -i (ignored) or -A is given.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   194
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   195
    The codes used to show the status of files are:
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   196
    M = modified
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   197
    A = added
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   198
    R = removed
2661
5c10b7ed3411 status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   199
    C = clean
1620
6c61646fee5e Adjusted all but one test output for the new behaviour of localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1568
diff changeset
   200
    ! = deleted, but still tracked
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   201
    ? = not tracked
2022
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
   202
    I = ignored (not shown by default)
2640
02b6fa7bbfbf fix tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2580
diff changeset
   203
      = the previous added file was copied from here
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   204
1515
3bd6d27cb81c Fix up test-help, mark test-rename +x
Matt Mackall <mpm@selenic.com>
parents: 1475
diff changeset
   205
aliases: st
3bd6d27cb81c Fix up test-help, mark test-rename +x
Matt Mackall <mpm@selenic.com>
parents: 1475
diff changeset
   206
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   207
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   208
2661
5c10b7ed3411 status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   209
 -A --all        show status of all files
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   210
 -m --modified   show only modified files
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   211
 -a --added      show only added files
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   212
 -r --removed    show only removed files
1620
6c61646fee5e Adjusted all but one test output for the new behaviour of localrepo.changes()
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1568
diff changeset
   213
 -d --deleted    show only deleted (but tracked) files
2661
5c10b7ed3411 status: add -c (clean) and -A (all files) options
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2640
diff changeset
   214
 -c --clean      show only files without changes
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   215
 -u --unknown    show only unknown (not tracked) files
2022
a59da8cc35e4 New option -i/--ignored for 'hg status' to show ignored files.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2019
diff changeset
   216
 -i --ignored    show ignored files
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   217
 -n --no-status  hide status prefix
2640
02b6fa7bbfbf fix tests.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2580
diff changeset
   218
 -C --copies     show source of copied files
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   219
 -0 --print0     end filenames with NUL, for use with xargs
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   220
 -I --include    include names matching the given patterns
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   221
 -X --exclude    exclude names matching the given patterns
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   222
hg status [OPTION]... [FILE]...
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   223
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   224
show changed files in the working directory
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   225
hg: unknown command 'foo'
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   226
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   227
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   228
basic commands (use "hg help" for the full list or option "-v" for details):
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   229
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   230
 add        add the specified files on the next commit
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   231
 annotate   show changeset information per file line
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   232
 clone      make a copy of an existing repository
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   233
 commit     commit the specified files or all outstanding changes
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   234
 diff       diff repository (or selected files)
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   235
 export     dump the header and diffs for one or more changesets
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
   236
 init       create a new repository in the given directory
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
   237
 log        show revision history of entire repository or files
1475
d791c335fb7b Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com>
parents: 1437
diff changeset
   238
 parents    show the parents of the working dir or revision
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   239
 pull       pull changes from the specified source
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   240
 push       push changes to the specified destination
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   241
 remove     remove the specified files on the next commit
2226
abfed2a82b07 fix test-help output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2217
diff changeset
   242
 revert     revert files or dirs to their states as of some revision
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   243
 serve      export the repository via HTTP
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   244
 status     show changed files in the working directory
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   245
 update     update or merge working directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   246
hg: unknown command 'skjdfks'
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   247
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   248
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   249
basic commands (use "hg help" for the full list or option "-v" for details):
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   250
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   251
 add        add the specified files on the next commit
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   252
 annotate   show changeset information per file line
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   253
 clone      make a copy of an existing repository
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   254
 commit     commit the specified files or all outstanding changes
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   255
 diff       diff repository (or selected files)
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   256
 export     dump the header and diffs for one or more changesets
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
   257
 init       create a new repository in the given directory
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
   258
 log        show revision history of entire repository or files
1475
d791c335fb7b Elevate parents to a "common" command in help
Matt Mackall <mpm@selenic.com>
parents: 1437
diff changeset
   259
 parents    show the parents of the working dir or revision
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   260
 pull       pull changes from the specified source
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   261
 push       push changes to the specified destination
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   262
 remove     remove the specified files on the next commit
2226
abfed2a82b07 fix test-help output.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 2217
diff changeset
   263
 revert     revert files or dirs to their states as of some revision
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   264
 serve      export the repository via HTTP
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   265
 status     show changed files in the working directory
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   266
 update     update or merge working directory