tests/test-help.out
author mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 930 0c4a6ad6efc1
child 1017 cbc3d3d39d7d
permissions -rw-r--r--
Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.
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
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
     9
 diff       diff working directory (or selected files)
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
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    12
 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
    13
 pull       pull changes from the specified source
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    14
 push       push changes to the specified destination
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    15
 remove     remove the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    16
 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
    17
 serve      export the repository via HTTP
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    18
 status     show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    19
 update     update or merge working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    20
 add        add the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    21
 annotate   show changeset information per file line
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    22
 clone      make a copy of an existing repository
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    23
 commit     commit the specified files or all outstanding changes
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    24
 diff       diff working directory (or selected files)
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    25
 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
    26
 init       create a new repository in the given directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    27
 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
    28
 pull       pull changes from the specified source
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    29
 push       push changes to the specified destination
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    30
 remove     remove the specified files on the next commit
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    31
 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
    32
 serve      export the repository via HTTP
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    33
 status     show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    34
 update     update or merge working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    35
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    36
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
    37
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
    38
847
f1555f48f884 Update the TODO file to the help changes, and the output of test-help.
kreijack@inwind.REMOVEME.it
parents: 814
diff changeset
    39
 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
    40
 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
    41
 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
    42
 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
    43
 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
    44
 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
    45
 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
    46
 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
    47
 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
    48
 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
    49
 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
    50
 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
    51
 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
    52
 import      import an ordered set of patches
930
0c4a6ad6efc1 Fix incoming help test again
mpm@selenic.com
parents: 928
diff changeset
    53
 incoming    show new changesets found in source
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
    54
 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
    55
 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
    56
 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
    57
 manifest    output the latest or given revision of the project manifest
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
    58
 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
    59
 parents     show the parents of the working dir or revision
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
    60
 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
    61
 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
    62
 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
    63
 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
    64
 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
    65
 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
    66
 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
    67
 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
    68
 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
    69
 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
    70
 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
    71
 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
    72
 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
    73
 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
    74
 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
    75
 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
    76
 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
    77
 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
    78
 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
    79
 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
    80
 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
    81
 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
    82
 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
    83
 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
    84
 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
    85
 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
    86
 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
    87
 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
    88
 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
    89
 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
    90
 import      import an ordered set of patches
930
0c4a6ad6efc1 Fix incoming help test again
mpm@selenic.com
parents: 928
diff changeset
    91
 incoming    show new changesets found in source
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
    92
 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
    93
 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
    94
 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
    95
 manifest    output the latest or given revision of the project manifest
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
    96
 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
    97
 parents     show the parents of the working dir or revision
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
    98
 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
    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
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   115
hg add: option -h not recognized
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   116
hg add [OPTION]... [FILE]...
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   117
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   118
add the specified files on the next commit
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   119
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   120
options:
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   121
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   122
 -I --include 
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   123
   include path in search
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   124
 -X --exclude 
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   125
   exclude path from search
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   126
hg add: option --skjdfks not recognized
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   127
hg add [OPTION]... [FILE]...
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   128
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   129
add the specified files on the next commit
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   130
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   131
options:
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
 -I --include 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   134
   include path in search
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   135
 -X --exclude 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   136
   exclude path from search
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   137
hg diff [-I] [-X] [-r REV1 [-r REV2]] [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   138
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   139
diff working directory (or selected files)
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   140
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   141
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   142
757
7000825ef3ba Updated help strings and test-help:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 740
diff changeset
   143
 -r --rev 
7000825ef3ba Updated help strings and test-help:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 740
diff changeset
   144
   revision
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   145
 -I --include 
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   146
   include path in search
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   147
 -X --exclude 
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   148
   exclude path from search
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   149
hg status [OPTION]... [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   150
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   151
show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   152
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   153
    M = modified
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   154
    A = added
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   155
    R = removed
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   156
    ? = not tracked
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   157
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   158
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   159
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   160
 -m --modified 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   161
   show only modified files
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   162
 -a --added 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   163
   show only added files
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   164
 -r --removed 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   165
   show only removed files
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   166
 -u --unknown 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   167
   show only unknown (not tracked) files
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   168
 -I --include 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   169
   include path in search
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   170
 -X --exclude 
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   171
   exclude path from search
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   172
hg status [OPTION]... [FILE]...
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   173
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   174
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
   175
hg: unknown command 'foo'
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   176
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   177
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   178
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
   179
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   180
 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
   181
 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
   182
 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
   183
 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
   184
 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
   185
 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
   186
 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
   187
 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
   188
 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
   189
 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
   190
 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
   191
 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
   192
 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
   193
 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
   194
 update     update or merge working directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   195
hg: unknown command 'skjdfks'
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   196
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   197
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   198
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
   199
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   200
 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
   201
 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
   202
 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
   203
 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
   204
 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
   205
 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
   206
 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
   207
 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
   208
 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
   209
 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
   210
 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
   211
 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
   212
 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
   213
 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
   214
 update     update or merge working directory