tests/test-help.out
author mpm@selenic.com
Tue, 16 Aug 2005 14:53:47 -0800
changeset 917 7f3f55903496
parent 914 8c850b81798b
child 925 5a034646e472
permissions -rw-r--r--
Fix hg clone race with writer Most read operations in hg don't need locks because we order reads and writes for consistency. Clone is an exception to this as we're copying entire file histories and could end up with more file history copied than we have commits. For now, make clone take a lock on the source repo. Non-hardlinked clone should eventually be changed to use lockless 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
+ hg 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     2
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     3
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     4
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
     5
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     6
 add        add the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     7
 annotate   show changeset information per file line
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     8
 clone      make a copy of an existing repository
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     9
 commit     commit the specified files or all outstanding changes
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    10
 diff       diff working directory (or selected files)
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    11
 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
    12
 init       create a new repository in the given directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    13
 log        show the revision history of the repository or a single file
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
+ hg -q
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    22
 add        add the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    23
 annotate   show changeset information per file line
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    24
 clone      make a copy of an existing repository
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    25
 commit     commit the specified files or all outstanding changes
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    26
 diff       diff working directory (or selected files)
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    27
 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
    28
 init       create a new repository in the given directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    29
 log        show the revision history of the repository or a single file
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
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 757
diff changeset
    37
+ hg help
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    38
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    39
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    40
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
    41
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    42
 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
    43
 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
    44
 annotate    show changeset information per file line
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    45
 cat         output the latest or given revision of a file
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
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    48
 copy        mark a file as copied or renamed for 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
    49
 diff        diff working directory (or selected files)
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
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    52
 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
    53
 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
    54
 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
    55
 import      import an ordered set of patches
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
    56
 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
    57
 locate      locate files matching specific patterns
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    58
 log         show the revision history of the repository or a single file
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    59
 manifest    output the latest or given revision of the project manifest
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    60
 parents     show the parents of the working dir or revision
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    61
 paths       show path or list of available paths
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    62
 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
    63
 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
    64
 rawcommit   raw commit interface
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    65
 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
    66
 remove      remove 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
    67
 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
    68
 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
    69
 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
    70
 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
    71
 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
    72
 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
    73
 tip         show the tip revision
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    74
 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
    75
 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
    76
 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
    77
 version     output version and copyright information
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 757
diff changeset
    78
+ hg -q help
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
 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
    80
 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
    81
 annotate    show changeset information per file line
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    82
 cat         output the latest or given revision of a file
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    83
 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
    84
 commit      commit the specified files or all outstanding changes
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    85
 copy        mark a file as copied or renamed for 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
    86
 diff        diff working directory (or selected files)
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    87
 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
    88
 forget      don't 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
    89
 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
    90
 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
    91
 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
    92
 import      import an ordered set of patches
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
    93
 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
    94
 locate      locate files matching specific patterns
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    95
 log         show the revision history of the repository or a single file
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    96
 manifest    output the latest or given revision of the project manifest
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    97
 parents     show the parents of the working dir or revision
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    98
 paths       show path or list of available paths
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    99
 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
   100
 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
   101
 rawcommit   raw commit interface
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   102
 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
   103
 remove      remove 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
   104
 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
   105
 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
   106
 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
   107
 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
   108
 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
   109
 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
   110
 tip         show the tip revision
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
   111
 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
   112
 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
   113
 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
   114
 version     output version and copyright information
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 757
diff changeset
   115
+ hg add -h
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   116
hg add: option -h not recognized
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   117
hg add [OPTION]... [FILE]...
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   118
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   119
add the specified files on the next commit
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   120
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   121
options:
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   122
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   123
 -I --include 
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   124
   include path in search
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   125
 -X --exclude 
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   126
   exclude path from search
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   127
+ hg add --skjdfks
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   128
hg add: option --skjdfks not recognized
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   129
hg add [OPTION]... [FILE]...
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   130
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   131
add the specified files on the next commit
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   132
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   133
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   134
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   135
 -I --include 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   136
   include path in search
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   137
 -X --exclude 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   138
   exclude path from search
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 757
diff changeset
   139
+ hg help diff
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   140
hg diff [-I] [-X] [-r REV1 [-r REV2]] [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   141
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   142
diff working directory (or selected files)
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   143
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   144
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   145
757
7000825ef3ba Updated help strings and test-help:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 740
diff changeset
   146
 -r --rev 
7000825ef3ba Updated help strings and test-help:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 740
diff changeset
   147
   revision
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   148
 -I --include 
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   149
   include path in search
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   150
 -X --exclude 
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   151
   exclude path from search
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   152
+ hg help status
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   153
hg status [OPTION]... [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   154
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   155
show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   156
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   157
    M = modified
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   158
    A = added
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   159
    R = removed
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   160
    ? = not tracked
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   161
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   162
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   163
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   164
 -m --modified 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   165
   show only modified files
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   166
 -a --added 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   167
   show only added files
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   168
 -r --removed 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   169
   show only removed files
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   170
 -u --unknown 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   171
   show only unknown (not tracked) files
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   172
 -I --include 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   173
   include path in search
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   174
 -X --exclude 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   175
   exclude path from search
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   176
+ hg -q help status
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   177
hg status [OPTION]... [FILE]...
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   178
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   179
show changed files in the working directory
801
1f9ec150a476 Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 757
diff changeset
   180
+ hg help foo
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   181
hg: unknown command 'foo'
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   182
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   183
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   184
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
   185
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   186
 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
   187
 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
   188
 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
   189
 commit     commit the specified files or all outstanding changes
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   190
 diff       diff working directory (or selected files)
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   191
 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
   192
 init       create a new repository in the given directory
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   193
 log        show the revision history of the repository or a single file
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   194
 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
   195
 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
   196
 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
   197
 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
   198
 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
   199
 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
   200
 update     update or merge working directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   201
+ hg skjdfks
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   202
hg: unknown command 'skjdfks'
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   203
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   204
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   205
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
   206
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   207
 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
   208
 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
   209
 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
   210
 commit     commit the specified files or all outstanding changes
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   211
 diff       diff working directory (or selected files)
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   212
 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
   213
 init       create a new repository in the given directory
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   214
 log        show the revision history of the repository or a single file
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   215
 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
   216
 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
   217
 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
   218
 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
   219
 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
   220
 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
   221
 update     update or merge working directory