tests/test-help.out
author Stephen Darnell
Wed, 14 Sep 2005 12:22:20 -0500
changeset 1241 3b4f05ff3130
parent 1223 8d43f8c0b836
child 1249 a5355fa5e33a
permissions -rw-r--r--
Add support for cloning with hardlinks on windows. In order to use hardlinks, the win32file module is needed, and this is present in ActivePython. If it isn't present, or hardlinks are not supported on the underlying filesystem, a regular copy is used. When using hardlinks the biggest benefit is probably the saving in space, but cloning can be much quicker. For example cloning the Xen tree (non trivial) without an update goes from about 95s to 15s. Unix-like platforms should be unaffected, although should be more tolerant on filesystems that don't support hard links. (tweaked by mpm to deal with new copyfiles function) --- hg.orig/mercurial/commands.py 2005-09-13 19:32:53.000000000 -0500 +++ hg/mercurial/commands.py 2005-09-14 12:11:34.000000000 -0500 @@ -620,10 +620,6 @@ def clone(ui, source, dest=None, **opts) if other.dev() != -1: abspath = os.path.abspath(source) - copyfile = (os.stat(dest).st_dev == other.dev() - and getattr(os, 'link', None) or shutil.copy2) - if copyfile is not shutil.copy2: - ui.note("cloning by hardlink\n") # we use a lock here because if we race with commit, we can # end up with extra data in the cloned revlogs that's not @@ -638,7 +634,7 @@ def clone(ui, source, dest=None, **opts) for f in files.split(): src = os.path.join(source, ".hg", f) dst = os.path.join(dest, ".hg", f) - util.copyfiles(src, dst, copyfile) + util.copyfiles(src, dst) repo = hg.repository(ui, dest) Index: hg/mercurial/util.py =================================================================== --- hg.orig/mercurial/util.py 2005-09-08 00:15:25.000000000 -0500 +++ hg/mercurial/util.py 2005-09-14 12:16:49.000000000 -0500 @@ -12,7 +12,7 @@ platform-specific details from the core. import os, errno from demandload import * -demandload(globals(), "re cStringIO") +demandload(globals(), "re cStringIO shutil") def binary(s): """return true if a string is binary data using diff's heuristic""" @@ -217,17 +217,28 @@ def rename(src, dst): os.unlink(dst) os.rename(src, dst) -def copyfiles(src, dst, copyfile): - """Copy a directory tree, files are copied using 'copyfile'.""" +def copyfiles(src, dst, hardlink=None): + """Copy a directory tree using hardlinks if possible""" + + if hardlink is None: + hardlink = (os.stat(src).st_dev == + os.stat(os.path.dirname(dst)).st_dev) if os.path.isdir(src): os.mkdir(dst) for name in os.listdir(src): srcname = os.path.join(src, name) dstname = os.path.join(dst, name) - copyfiles(srcname, dstname, copyfile) + copyfiles(srcname, dstname, hardlink) else: - copyfile(src, dst) + if hardlink: + try: + os_link(src, dst) + except: + hardlink = False + shutil.copy2(src, dst) + else: + shutil.copy2(src, dst) def opener(base): """ @@ -244,13 +255,13 @@ def opener(base): if mode[0] != "r": try: - s = os.stat(f) + nlink = nlinks(f) except OSError: d = os.path.dirname(f) if not os.path.isdir(d): os.makedirs(d) else: - if s.st_nlink > 1: + if nlink > 1: file(f + ".tmp", "wb").write(file(f, "rb").read()) rename(f+".tmp", f) @@ -266,10 +277,41 @@ def _makelock_file(info, pathname): def _readlock_file(pathname): return file(pathname).read() +def nlinks(pathname): + """Return number of hardlinks for the given file.""" + return os.stat(pathname).st_nlink + +if hasattr(os, 'link'): + os_link = os.link +else: + def os_link(src, dst): + raise OSError(0, "Hardlinks not supported") + # Platform specific variants if os.name == 'nt': nulldev = 'NUL:' + try: # ActivePython can create hard links using win32file module + import win32file + + def os_link(src, dst): # NB will only succeed on NTFS + win32file.CreateHardLink(dst, src) + + def nlinks(pathname): + """Return number of hardlinks for the given file.""" + try: + fh = win32file.CreateFile(pathname, + win32file.GENERIC_READ, win32file.FILE_SHARE_READ, + None, win32file.OPEN_EXISTING, 0, None) + res = win32file.GetFileInformationByHandle(fh) + fh.Close() + return res[7] + except: + return os.stat(pathname).st_nlink + + except ImportError: + pass + def is_exec(f, last): return last
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
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
849
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
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
    27
 log        show revision history of entire repository or files
849
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
1223
8d43f8c0b836 Update test-help for bundle/unbundle
mpm@selenic.com
parents: 1113
diff changeset
    42
 bundle      create 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
    43
 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
    44
 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
    45
 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
    46
 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
    47
 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
    48
 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
    49
 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
    50
 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
    51
 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
    52
 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
    53
 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
    54
 import      import an ordered set of patches
930
0c4a6ad6efc1 Fix incoming help test again
mpm@selenic.com
parents: 928
diff changeset
    55
 incoming    show new changesets found in source
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
1034
8dbbea5bc844 Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com>
parents: 1017
diff changeset
    58
 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
    59
 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
    60
 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
    61
 parents     show the parents of the working dir or revision
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
    62
 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
    63
 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
    64
 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
    65
 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
    66
 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
    67
 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
    68
 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
    69
 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
    70
 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
    71
 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
    72
 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
    73
 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
    74
 tip         show the tip revision
1223
8d43f8c0b836 Update test-help for bundle/unbundle
mpm@selenic.com
parents: 1113
diff changeset
    75
 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
    76
 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
    77
 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
    78
 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
    79
 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
    80
 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
    81
 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
    82
 annotate    show changeset information per file line
1223
8d43f8c0b836 Update test-help for bundle/unbundle
mpm@selenic.com
parents: 1113
diff changeset
    83
 bundle      create 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
    84
 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
    85
 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
    86
 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
    87
 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
    88
 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
    89
 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
    90
 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
    91
 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
    92
 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
    93
 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
    94
 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
    95
 import      import an ordered set of patches
930
0c4a6ad6efc1 Fix incoming help test again
mpm@selenic.com
parents: 928
diff changeset
    96
 incoming    show new changesets found in source
908
fcd34a9577e8 Fix tests for new init command
mpm@selenic.com
parents: 896
diff changeset
    97
 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
    98
 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
    99
 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
   100
 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
   101
 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
   102
 parents     show the parents of the working dir or revision
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 914
diff changeset
   103
 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
   104
 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
   105
 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
   106
 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
   107
 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
   108
 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
   109
 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
   110
 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
   111
 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
   112
 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
   113
 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
   114
 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
   115
 tip         show the tip revision
1223
8d43f8c0b836 Update test-help for bundle/unbundle
mpm@selenic.com
parents: 1113
diff changeset
   116
 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
   117
 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
   118
 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
   119
 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
   120
 version     output version and copyright information
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   121
hg add [OPTION]... [FILE]...
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   122
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   123
add the specified files on the next commit
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   124
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   125
options:
736
1e84f1014f33 Update tests to reflect walk changes.
Bryan O'Sullivan <bos@serpentine.com>
parents: 725
diff changeset
   126
1052
d8279ca39dc7 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1048
diff changeset
   127
 -I --include  include path in search
d8279ca39dc7 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1048
diff changeset
   128
 -X --exclude  exclude path from search
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   129
hg add: option --skjdfks not recognized
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   130
hg add [OPTION]... [FILE]...
596
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   131
9a8daeff0ffa A bunch of parsing/help updates
mpm@selenic.com
parents: 593
diff changeset
   132
add the specified files on the next commit
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   133
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   134
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   135
1052
d8279ca39dc7 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1048
diff changeset
   136
 -I --include  include path in search
d8279ca39dc7 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1048
diff changeset
   137
 -X --exclude  exclude path from search
1055
ea465485f54f Minor test-help fix
mpm@selenic.com
parents: 1052
diff changeset
   138
hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   139
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   140
diff working directory (or selected files)
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   141
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   142
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   143
1052
d8279ca39dc7 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1048
diff changeset
   144
 -r --rev      revision
d8279ca39dc7 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1048
diff changeset
   145
 -a --text     treat all files as text
d8279ca39dc7 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1048
diff changeset
   146
 -I --include  include path in search
d8279ca39dc7 Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1048
diff changeset
   147
 -X --exclude  exclude path from search
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   148
hg status [OPTION]... [FILE]...
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   149
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   150
show changed files in the working directory
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   151
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   152
    M = modified
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   153
    A = added
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   154
    R = removed
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   155
    ? = not tracked
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
options:
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   158
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   159
 -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
   160
 -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
   161
 -r --removed    show only removed files
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   162
 -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
   163
 -n --no-status  hide status prefix
1113
6130de75bb2a Updated manpage and help.
TK Soh <teekaysoh@yahoo.com>
parents: 1107
diff changeset
   164
 -0 --print0     end filenames with NUL
1107
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   165
 -I --include    include path in search
a9c45e537f77 Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1086
diff changeset
   166
 -X --exclude    exclude path from search
914
8c850b81798b Fix up help test
mpm@selenic.com
parents: 910
diff changeset
   167
hg status [OPTION]... [FILE]...
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   168
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   169
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
   170
hg: unknown command 'foo'
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   171
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   172
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   173
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
   174
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   175
 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
   176
 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
   177
 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
   178
 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
   179
 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
   180
 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
   181
 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
   182
 log        show revision history of entire repository or files
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   183
 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
   184
 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
   185
 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
   186
 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
   187
 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
   188
 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
   189
 update     update or merge working directory
849
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   190
hg: unknown command 'skjdfks'
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   191
Mercurial Distributed SCM
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   192
8933ef744325 Further help improvements:
Thomas Arendsen Hein <thomas@intevation.de>
parents: 848
diff changeset
   193
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
   194
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   195
 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
   196
 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
   197
 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
   198
 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
   199
 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
   200
 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
   201
 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
   202
 log        show revision history of entire repository or files
848
221628fe9b62 Always show short help when an unknown command is given.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 847
diff changeset
   203
 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
   204
 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
   205
 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
   206
 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
   207
 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
   208
 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
   209
 update     update or merge working directory