tests/test-help.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 29 Mar 2006 10:27:16 -0800
changeset 2019 ced2d3620f95
parent 1818 9bbc7b304c34
child 2022 a59da8cc35e4
permissions -rw-r--r--
add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
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
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    17
 revert     revert modified files or dirs back to their unmodified states
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
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    33
 revert     revert modified files or dirs back to their unmodified states
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
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    41
 add         add the specified files on the next commit
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    42
 addremove   add all new files, delete all missing files
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    43
 annotate    show changeset information per file line
1223
8d43f8c0b836 Update test-help for bundle/unbundle
mpm@selenic.com
parents: 1113
diff changeset
    44
 bundle      create a changegroup file
1254
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
    45
 cat         output the latest or given revisions of files
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    46
 clone       make a copy of an existing repository
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    47
 commit      commit the specified files or all outstanding changes
1249
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1223
diff changeset
    48
 copy        mark files as copied for the next commit
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
    49
 diff        diff repository (or selected files)
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    50
 export      dump the header and diffs for one or more changesets
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    51
 forget      don't add the specified files on the next commit
1060
e453d2053b2e Merge from BOS, fix help
mpm@selenic.com
parents: 1055
diff changeset
    52
 grep        search for a pattern in specified files and revisions
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    53
 heads       show current repository heads
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    54
 help        show help for a given command or all commands
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    55
 identify    print information about the working copy
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    56
 import      import an ordered set of patches
930
0c4a6ad6efc1 Fix incoming help test again
mpm@selenic.com
parents: 928
diff changeset
    57
 incoming    show new changesets found in source
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
    58
 init        create a new repository in the given directory
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    59
 locate      locate files matching specific patterns
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
    60
 log         show revision history of entire repository or files
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    61
 manifest    output the latest or given revision of the project manifest
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1818
diff changeset
    62
 merge       Merge working directory with another revision
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
    63
 outgoing    show changesets not found in destination
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    64
 parents     show the parents of the working dir or revision
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
    65
 paths       show definition of symbolic path names
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    66
 pull        pull changes from the specified source
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    67
 push        push changes to the specified destination
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    68
 recover     roll back an interrupted transaction
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    69
 remove      remove the specified files on the next commit
1253
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
    70
 rename      rename files; equivalent of copy + remove
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    71
 revert      revert modified files or dirs back to their unmodified states
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    72
 root        print the root (top) of the current working dir
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    73
 serve       export the repository via HTTP
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    74
 status      show changed files in the working directory
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    75
 tag         add a tag for the current tip or a given revision
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    76
 tags        list repository tags
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    77
 tip         show the tip revision
1223
8d43f8c0b836 Update test-help for bundle/unbundle
mpm@selenic.com
parents: 1113
diff changeset
    78
 unbundle    apply a changegroup file
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    79
 undo        undo the last commit or pull
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    80
 update      update or merge working directory
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    81
 verify      verify the integrity of the repository
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    82
 version     output version and copyright information
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    83
 add         add the specified files on the next commit
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    84
 addremove   add all new files, delete all missing files
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    85
 annotate    show changeset information per file line
1223
8d43f8c0b836 Update test-help for bundle/unbundle
mpm@selenic.com
parents: 1113
diff changeset
    86
 bundle      create a changegroup file
1254
e6560042b7b8 Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1253
diff changeset
    87
 cat         output the latest or given revisions of files
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    88
 clone       make a copy of an existing repository
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    89
 commit      commit the specified files or all outstanding changes
1249
a5355fa5e33a Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents: 1223
diff changeset
    90
 copy        mark files as copied for the next commit
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
    91
 diff        diff repository (or selected files)
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    92
 export      dump the header and diffs for one or more changesets
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    93
 forget      don't add the specified files on the next commit
1060
e453d2053b2e Merge from BOS, fix help
mpm@selenic.com
parents: 1055
diff changeset
    94
 grep        search for a pattern in specified files and revisions
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    95
 heads       show current repository heads
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    96
 help        show help for a given command or all commands
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    97
 identify    print information about the working copy
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    98
 import      import an ordered set of patches
930
0c4a6ad6efc1 Fix incoming help test again
mpm@selenic.com
parents: 928
diff changeset
    99
 incoming    show new changesets found in source
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
   100
 init        create a new repository in the given directory
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   101
 locate      locate files matching specific patterns
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
   102
 log         show revision history of entire repository or files
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   103
 manifest    output the latest or given revision of the project manifest
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1818
diff changeset
   104
 merge       Merge working directory with another revision
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
   105
 outgoing    show changesets not found in destination
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   106
 parents     show the parents of the working dir or revision
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
   107
 paths       show definition of symbolic path names
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   108
 pull        pull changes from the specified source
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   109
 push        push changes to the specified destination
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   110
 recover     roll back an interrupted transaction
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   111
 remove      remove the specified files on the next commit
1253
a45e717c61a8 Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1249
diff changeset
   112
 rename      rename files; equivalent of copy + remove
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   113
 revert      revert modified files or dirs back to their unmodified states
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   114
 root        print the root (top) of the current working dir
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   115
 serve       export the repository via HTTP
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   116
 status      show changed files in the working directory
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   117
 tag         add a tag for the current tip or a given revision
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   118
 tags        list repository tags
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   119
 tip         show the tip revision
1223
8d43f8c0b836 Update test-help for bundle/unbundle
mpm@selenic.com
parents: 1113
diff changeset
   120
 unbundle    apply a changegroup file
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   121
 undo        undo the last commit or pull
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   122
 update      update or merge working directory
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   123
 verify      verify the integrity of the repository
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   124
 version     output version and copyright information
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   125
hg add [OPTION]... [FILE]...
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   126
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   127
add the specified files on the next commit
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   128
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   129
    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
   130
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   131
    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
   132
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   133
    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
   134
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   135
options:
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   136
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   137
 -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
   138
 -X --exclude  exclude names matching the given patterns
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   139
hg add: option --skjdfks not recognized
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   140
hg add [OPTION]... [FILE]...
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   141
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   142
add the specified files on the next commit
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   143
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   144
    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
   145
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   146
    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
   147
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   148
    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
   149
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   150
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   151
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   152
 -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
   153
 -X --exclude  exclude names matching the given patterns
1055
ea465485f54f Minor test-help fix
mpm@selenic.com
parents: 1052
diff changeset
   154
hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   155
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   156
diff repository (or selected files)
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   157
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   158
    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
   159
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   160
    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
   161
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   162
    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
   163
    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
   164
    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
   165
    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
   166
    to its parent.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   167
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   168
    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
   169
    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
   170
    probably with undesirable results.
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   171
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   172
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   173
1733
6d288d8c3ca6 fix test-help diff options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1657
diff changeset
   174
 -r --rev               revision
6d288d8c3ca6 fix test-help diff options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1657
diff changeset
   175
 -a --text              treat all files as text
6d288d8c3ca6 fix test-help diff options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1657
diff changeset
   176
 -p --show-function     show which function each change is in
6d288d8c3ca6 fix test-help diff options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1657
diff changeset
   177
 -w --ignore-all-space  ignore white space when comparing lines
1816
08f4398bdb1a Updated help synopsises and reordered some options. Dropped [-n] from revert.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1733
diff changeset
   178
 -I --include           include names matching the given patterns
1733
6d288d8c3ca6 fix test-help diff options.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1657
diff changeset
   179
 -X --exclude           exclude names matching the given patterns
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   180
hg status [OPTION]... [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   181
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   182
show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   183
1568
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   184
    Show changed files in the repository.  If names are
1d7d0c07e8f3 make all commands be repo-wide by default
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1515
diff changeset
   185
    given, only files that match are shown.
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   186
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   187
    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
   188
    M = modified
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   189
    A = added
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   190
    R = removed
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
   191
    ! = deleted, but still tracked
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   192
    ? = not tracked
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   193
1515
3bd6d27cb81c Fix up test-help, mark test-rename +x
Matt Mackall <mpm@selenic.com>
parents: 1475
diff changeset
   194
aliases: st
3bd6d27cb81c Fix up test-help, mark test-rename +x
Matt Mackall <mpm@selenic.com>
parents: 1475
diff changeset
   195
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   196
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   197
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   198
 -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
   199
 -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
   200
 -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
   201
 -d --deleted    show only deleted (but tracked) files
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   202
 -u --unknown    show only unknown (not tracked) files
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   203
 -n --no-status  hide status prefix
1437
ea51d296085f import docstring from doc/hg.1.txt
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1254
diff changeset
   204
 -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
   205
 -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
   206
 -X --exclude    exclude names matching the given patterns
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   207
hg status [OPTION]... [FILE]...
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   208
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   209
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
   210
hg: unknown command 'foo'
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   211
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   212
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   213
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
   214
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   215
 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
   216
 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
   217
 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
   218
 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
   219
 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
   220
 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
   221
 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
   222
 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
   223
 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
   224
 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
   225
 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
   226
 remove     remove 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
   227
 revert     revert modified files or dirs back to their unmodified states
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   228
 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
   229
 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
   230
 update     update or merge working directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   231
hg: unknown command 'skjdfks'
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   232
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   233
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   234
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
   235
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   236
 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
   237
 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
   238
 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
   239
 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
   240
 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
   241
 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
   242
 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
   243
 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
   244
 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
   245
 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
   246
 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
   247
 remove     remove 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
   248
 revert     revert modified files or dirs back to their unmodified states
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   249
 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
   250
 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
   251
 update     update or merge working directory