##// END OF EJS Templates
blackbox: fix recording exit codes (issue3938)...
blackbox: fix recording exit codes (issue3938) Previously the blackbox wrapped runcommand, but this failed to see the error codes that were created if an exception occurred. I moved that logging to now wrap _runcatch, so it can observe and log the actual error code (such as when a user ctrl+c's during a command). Updated the tests as well. Tested the change by running all the tests with the blackbox extension enabled and verifying nothing broke (aside from things that printed what extensions were enabeld). The progress tests are affected by calls to time.time() so they needed to be updated to pass.

File last commit:

r19079:1e433b54 stable
r19229:41e39a02 stable
Show More
test-help.t
1925 lines | 57.0 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
r12328 Short help:
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
$ hg
Mercurial Distributed SCM
basic commands:
Olav Reinert
help: format command and option list help using RST...
r16853 add add the specified files on the next commit
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
serve start stand-alone webserver
status show changed files in the working directory
summary summarize working directory state
update update working directory (or switch revisions)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
use "hg help" for the full list of commands or "hg -v" for details
$ hg -q
Olav Reinert
help: format command and option list help using RST...
r16853 add add the specified files on the next commit
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
serve start stand-alone webserver
status show changed files in the working directory
summary summarize working directory state
update update working directory (or switch revisions)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
$ hg help
Mercurial Distributed SCM
list of commands:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information by line for each file
archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
bookmarks track a line of development with movable markers
branch set or show the current branch name
branches list repository named branches
bundle create a changegroup file
cat output the current or given revision of files
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
copy mark files as copied for the next commit
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
graft copy changes from other branches onto the current branch
grep search for a pattern in specified files and revisions
heads show current repository heads or show branch heads
help show help for a given topic or a help overview
identify identify the working copy or specified revision
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
locate locate files matching specific patterns
log show revision history of entire repository or files
manifest output the current or given revision of the project manifest
merge merge working directory with another revision
outgoing show changesets not found in the destination
parents show the parents of the working directory or revision
paths show aliases for remote repositories
phase set or show the current phase name
pull pull changes from the specified source
push push changes to the specified destination
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files
revert restore files to their checkout state
rollback roll back the last transaction (dangerous)
root print the root (top) of the current working directory
serve start stand-alone webserver
showconfig show combined config settings from all hgrc files
status show changed files in the working directory
summary summarize working directory state
tag add one or more tags for the current or given revision
tags list repository tags
tip show the tip revision
unbundle apply one or more changegroup files
update update working directory (or switch revisions)
verify verify the integrity of the repository
version output version and copyright information
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
additional help topics:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 config Configuration Files
dates Date Formats
diffs Diff Formats
environment Environment Variables
Martin Geisler
help: consistently use title capitalization for help topics
r16547 extensions Using Additional Features
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 filesets Specifying File Sets
glossary Glossary
Martin Geisler
help: consistently use title capitalization for help topics
r16547 hgignore Syntax for Mercurial Ignore Files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 hgweb Configuring hgweb
merge-tools Merge Tools
multirevs Specifying Multiple Revisions
patterns File Name Patterns
Matt Mackall
help: add phases topic
r15996 phases Working with Phases
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 revisions Specifying Single Revisions
revsets Specifying Revision Sets
subrepos Subrepositories
templating Template Usage
urls URL Paths
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Martin Geisler
commands: clarify which aliases "hg help -v" show (issue2572)
r13230 use "hg -v help" to show builtin aliases and global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
$ hg -q help
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information by line for each file
archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
bookmarks track a line of development with movable markers
branch set or show the current branch name
branches list repository named branches
bundle create a changegroup file
cat output the current or given revision of files
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
copy mark files as copied for the next commit
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
graft copy changes from other branches onto the current branch
grep search for a pattern in specified files and revisions
heads show current repository heads or show branch heads
help show help for a given topic or a help overview
identify identify the working copy or specified revision
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
locate locate files matching specific patterns
log show revision history of entire repository or files
manifest output the current or given revision of the project manifest
merge merge working directory with another revision
outgoing show changesets not found in the destination
parents show the parents of the working directory or revision
paths show aliases for remote repositories
phase set or show the current phase name
pull pull changes from the specified source
push push changes to the specified destination
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files
revert restore files to their checkout state
rollback roll back the last transaction (dangerous)
root print the root (top) of the current working directory
serve start stand-alone webserver
showconfig show combined config settings from all hgrc files
status show changed files in the working directory
summary summarize working directory state
tag add one or more tags for the current or given revision
tags list repository tags
tip show the tip revision
unbundle apply one or more changegroup files
update update working directory (or switch revisions)
verify verify the integrity of the repository
version output version and copyright information
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
additional help topics:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 config Configuration Files
dates Date Formats
diffs Diff Formats
environment Environment Variables
Martin Geisler
help: consistently use title capitalization for help topics
r16547 extensions Using Additional Features
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 filesets Specifying File Sets
glossary Glossary
Martin Geisler
help: consistently use title capitalization for help topics
r16547 hgignore Syntax for Mercurial Ignore Files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 hgweb Configuring hgweb
merge-tools Merge Tools
multirevs Specifying Multiple Revisions
patterns File Name Patterns
Matt Mackall
help: add phases topic
r15996 phases Working with Phases
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 revisions Specifying Single Revisions
revsets Specifying Revision Sets
subrepos Subrepositories
templating Template Usage
urls URL Paths
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Test short command list with verbose option
$ hg -v help shortlist
Matt Mackall
help: drop with_version...
r15020 Mercurial Distributed SCM
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
basic commands:
Olav Reinert
help: format command and option list help using RST...
r16853 add add the specified files on the next commit
annotate, blame
show changeset information by line for each file
clone make a copy of an existing repository
commit, ci commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log, history show revision history of entire repository or files
merge merge working directory with another revision
pull pull changes from the specified source
push push changes to the specified destination
remove, rm remove the specified files on the next commit
serve start stand-alone webserver
status, st show changed files in the working directory
summary, sum summarize working directory state
update, up, checkout, co
update working directory (or switch revisions)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
global options:
Matt Mackall
help: use RST to format option lists
r15145
-R --repository REPO repository root directory or name of overlay bundle
file
--cwd DIR change working directory
-y --noninteractive do not prompt, automatically pick the first choice for
all prompts
-q --quiet suppress output
-v --verbose enable additional output
--config CONFIG [+] set/override config option (use 'section.name=value')
--debug enable debugging output
--debugger start debugger
--encoding ENCODE set the charset encoding (default: ascii)
--encodingmode MODE set the charset encoding mode (default: strict)
--traceback always print a traceback on exception
--time time how long the command takes
--profile print command execution profile
--version output version information and exit
-h --help display help and exit
Pierre-Yves David
clfilter: enforce hidden changeset globally...
r18267 --hidden consider hidden changesets
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
[+] marked option can be specified multiple times
use "hg help" for the full list of commands
$ hg add -h
hg add [OPTION]... [FILE]...
add the specified files on the next commit
Schedule files to be version controlled and added to the repository.
The files will be added to the repository at the next commit. To undo an
add before that, see "hg forget".
If no names are given, add all files to the repository.
Returns 0 if all files are successfully added.
options:
Matt Mackall
help: use RST to format option lists
r15145 -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-S --subrepos recurse into subrepositories
-n --dry-run do not perform actions, just print output
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
[+] marked option can be specified multiple times
FUJIWARA Katsunori
help: indicate help omitting if help document is not fully displayed...
r17837 use "hg -v help add" to show more complete help and the global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Verbose help for add
$ hg add -hv
hg add [OPTION]... [FILE]...
add the specified files on the next commit
Schedule files to be version controlled and added to the repository.
The files will be added to the repository at the next commit. To undo an
add before that, see "hg forget".
If no names are given, add all files to the repository.
An example showing how new (unknown) files are added automatically by "hg
add":
$ ls
foo.c
$ hg status
? foo.c
$ hg add
adding foo.c
$ hg status
A foo.c
Returns 0 if all files are successfully added.
options:
Matt Mackall
help: use RST to format option lists
r15145 -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-S --subrepos recurse into subrepositories
-n --dry-run do not perform actions, just print output
[+] marked option can be specified multiple times
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
global options:
Matt Mackall
help: use RST to format option lists
r15145
-R --repository REPO repository root directory or name of overlay bundle
file
--cwd DIR change working directory
-y --noninteractive do not prompt, automatically pick the first choice for
all prompts
-q --quiet suppress output
-v --verbose enable additional output
--config CONFIG [+] set/override config option (use 'section.name=value')
--debug enable debugging output
--debugger start debugger
--encoding ENCODE set the charset encoding (default: ascii)
--encodingmode MODE set the charset encoding mode (default: strict)
--traceback always print a traceback on exception
--time time how long the command takes
--profile print command execution profile
--version output version information and exit
-h --help display help and exit
Pierre-Yves David
clfilter: enforce hidden changeset globally...
r18267 --hidden consider hidden changesets
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
[+] marked option can be specified multiple times
Test help option with version option
$ hg add -h --version
Brodie Rao
tests: add glob matching for unified tests...
r12376 Mercurial Distributed SCM (version *) (glob)
Matt Mackall
version: replace email address with url to reduce private mail
r12829 (see http://mercurial.selenic.com for more information)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Martin Geisler
commands: bump copyright year
r15834 Copyright (C) 2005-2012 Matt Mackall and others
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073 This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
$ hg add --skjdfks
hg add: option --skjdfks not recognized
hg add [OPTION]... [FILE]...
add the specified files on the next commit
options:
Matt Mackall
help: use RST to format option lists
r15145 -I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-S --subrepos recurse into subrepositories
-n --dry-run do not perform actions, just print output
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
[+] marked option can be specified multiple times
Adrian Buehlmann
help: do not show full help text for command on option errors...
r13950 use "hg help add" to show the full help text
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Test ambiguous command help
$ hg help ad
list of commands:
Olav Reinert
help: format command and option list help using RST...
r16853 add add the specified files on the next commit
addremove add all new files, delete all missing files
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Martin Geisler
commands: clarify which aliases "hg help -v" show (issue2572)
r13230 use "hg -v help ad" to show builtin aliases and global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Test command without options
$ hg help verify
hg verify
verify the integrity of the repository
Verify the integrity of the current repository.
This will perform an extensive check of the repository's integrity,
validating the hashes and checksums of each entry in the changelog,
manifest, and tracked files, as well as the integrity of their crosslinks
and indices.
FUJIWARA Katsunori
help: add information about recovery from corruption to help of "verify"...
r17717 Please see http://mercurial.selenic.com/wiki/RepositoryCorruption for more
information about recovery from corruption of the repository.
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073 Returns 0 on success, 1 if errors are encountered.
FUJIWARA Katsunori
help: indicate help omitting if help document is not fully displayed...
r17837 use "hg -v help verify" to show the global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
$ hg help diff
hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
diff repository (or selected files)
Show differences between revisions for the specified files.
Differences between files are shown using the unified diff format.
Erik Zielke
Use note admonition
r12389 Note:
diff may generate unexpected results for merges, as it will default to
comparing against the working directory's first parent changeset if no
revisions are specified.
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
When two revision arguments are given, then changes are shown between
those revisions. If only one revision is specified then that revision is
compared to the working directory, and, when no revisions are specified,
the working directory files are compared to its parent.
Alternatively you can specify -c/--change with a revision to see the
changes in that changeset relative to its first parent.
Without the -a/--text option, diff will avoid generating diffs of files it
detects as binary. With -a, diff will generate a diff anyway, probably
with undesirable results.
Use the -g/--git option to generate diffs in the git extended diff format.
For more information, read "hg help diffs".
Returns 0 on success.
options:
Matt Mackall
help: use RST to format option lists
r15145 -r --rev REV [+] revision
-c --change REV change made by revision
-a --text treat all files as text
-g --git use git extended diff format
--nodates omit dates from diff headers
-p --show-function show which function each change is in
--reverse produce a diff that undoes the changes
-w --ignore-all-space ignore white space when comparing lines
-b --ignore-space-change ignore changes in the amount of white space
-B --ignore-blank-lines ignore changes whose lines are all blank
-U --unified NUM number of lines of context to show
--stat output diffstat-style summary of changes
-I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-S --subrepos recurse into subrepositories
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
[+] marked option can be specified multiple times
FUJIWARA Katsunori
help: indicate help omitting if help document is not fully displayed...
r17837 use "hg -v help diff" to show more complete help and the global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
$ hg help status
hg status [OPTION]... [FILE]...
aliases: st
show changed files in the working directory
Show status of files in the repository. If names are given, only files
that match are shown. Files that are clean or ignored or the source of a
copy/move operation, are not listed unless -c/--clean, -i/--ignored,
-C/--copies or -A/--all are given. Unless options described with "show
only ..." are given, the options -mardu are used.
Option -q/--quiet hides untracked (unknown and ignored) files unless
explicitly requested with -u/--unknown or -i/--ignored.
Christian Ebert
Use more note admonitions in help texts
r12390 Note:
status may appear to disagree with diff if permissions have changed or
a merge has occurred. The standard diff format does not report
permission changes and diff only reports changes relative to one merge
parent.
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
If one revision is given, it is used as the base revision. If two
revisions are given, the differences between them are shown. The --change
option can also be used as a shortcut to list the changed files of a
revision from its first parent.
The codes used to show the status of files are:
M = modified
A = added
R = removed
C = clean
! = missing (deleted by non-hg command, but still tracked)
? = not tracked
I = ignored
= origin of the previous file listed as A (added)
Returns 0 on success.
options:
Matt Mackall
help: use RST to format option lists
r15145 -A --all show status of all files
-m --modified show only modified files
-a --added show only added files
-r --removed show only removed files
-d --deleted show only deleted (but tracked) files
-c --clean show only files without changes
-u --unknown show only unknown (not tracked) files
-i --ignored show only ignored files
-n --no-status hide status prefix
-C --copies show source of copied files
-0 --print0 end filenames with NUL, for use with xargs
--rev REV [+] show difference from revision
--change REV list the changed files of a revision
-I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-S --subrepos recurse into subrepositories
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
[+] marked option can be specified multiple times
FUJIWARA Katsunori
help: indicate help omitting if help document is not fully displayed...
r17837 use "hg -v help status" to show more complete help and the global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
$ hg -q help status
hg status [OPTION]... [FILE]...
show changed files in the working directory
$ hg help foo
hg: unknown command 'foo'
Mercurial Distributed SCM
basic commands:
Olav Reinert
help: format command and option list help using RST...
r16853 add add the specified files on the next commit
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
serve start stand-alone webserver
status show changed files in the working directory
summary summarize working directory state
update update working directory (or switch revisions)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
use "hg help" for the full list of commands or "hg -v" for details
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
$ hg skjdfks
hg: unknown command 'skjdfks'
Mercurial Distributed SCM
basic commands:
Olav Reinert
help: format command and option list help using RST...
r16853 add add the specified files on the next commit
annotate show changeset information by line for each file
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log show revision history of entire repository or files
merge merge working directory with another revision
pull pull changes from the specified source
push push changes to the specified destination
remove remove the specified files on the next commit
serve start stand-alone webserver
status show changed files in the working directory
summary summarize working directory state
update update working directory (or switch revisions)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
use "hg help" for the full list of commands or "hg -v" for details
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
$ cat > helpext.py <<EOF
> import os
> from mercurial import commands
>
> def nohelp(ui, *args, **kwargs):
> pass
>
> cmdtable = {
> "nohelp": (nohelp, [], "hg nohelp"),
> }
>
> commands.norepo += ' nohelp'
> EOF
$ echo '[extensions]' >> $HGRCPATH
$ echo "helpext = `pwd`/helpext.py" >> $HGRCPATH
Test command with no help text
$ hg help nohelp
hg nohelp
(no help text available)
FUJIWARA Katsunori
help: indicate help omitting if help document is not fully displayed...
r17837 use "hg -v help nohelp" to show the global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Thomas Arendsen Hein
help: fix 'hg help -k' matching an extension without docs...
r16884 $ hg help -k nohelp
Commands:
nohelp hg nohelp
Extension Commands:
nohelp (no help text available)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073 Test that default list of commands omits extension commands
$ hg help
Mercurial Distributed SCM
list of commands:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information by line for each file
archive create an unversioned archive of a repository revision
backout reverse effect of earlier changeset
bisect subdivision search of changesets
bookmarks track a line of development with movable markers
branch set or show the current branch name
branches list repository named branches
bundle create a changegroup file
cat output the current or given revision of files
clone make a copy of an existing repository
commit commit the specified files or all outstanding changes
copy mark files as copied for the next commit
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
graft copy changes from other branches onto the current branch
grep search for a pattern in specified files and revisions
heads show current repository heads or show branch heads
help show help for a given topic or a help overview
identify identify the working copy or specified revision
import import an ordered set of patches
incoming show new changesets found in source
init create a new repository in the given directory
locate locate files matching specific patterns
log show revision history of entire repository or files
manifest output the current or given revision of the project manifest
merge merge working directory with another revision
outgoing show changesets not found in the destination
parents show the parents of the working directory or revision
paths show aliases for remote repositories
phase set or show the current phase name
pull pull changes from the specified source
push push changes to the specified destination
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
resolve redo merges or set/view the merge status of files
revert restore files to their checkout state
rollback roll back the last transaction (dangerous)
root print the root (top) of the current working directory
serve start stand-alone webserver
showconfig show combined config settings from all hgrc files
status show changed files in the working directory
summary summarize working directory state
tag add one or more tags for the current or given revision
tags list repository tags
tip show the tip revision
unbundle apply one or more changegroup files
update update working directory (or switch revisions)
verify verify the integrity of the repository
version output version and copyright information
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
enabled extensions:
Olav Reinert
minirst: simplify and standardize field list formatting...
r15861 helpext (no help text available)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
additional help topics:
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 config Configuration Files
dates Date Formats
diffs Diff Formats
environment Environment Variables
Martin Geisler
help: consistently use title capitalization for help topics
r16547 extensions Using Additional Features
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 filesets Specifying File Sets
glossary Glossary
Martin Geisler
help: consistently use title capitalization for help topics
r16547 hgignore Syntax for Mercurial Ignore Files
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 hgweb Configuring hgweb
merge-tools Merge Tools
multirevs Specifying Multiple Revisions
patterns File Name Patterns
Matt Mackall
help: add phases topic
r15996 phases Working with Phases
Olav Reinert
help: fix column alignment in "hg help" output...
r15862 revisions Specifying Single Revisions
revsets Specifying Revision Sets
subrepos Subrepositories
templating Template Usage
urls URL Paths
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Martin Geisler
commands: clarify which aliases "hg help -v" show (issue2572)
r13230 use "hg -v help" to show builtin aliases and global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Yun Lee
help: sort help topics to make the output more readable (issue2751)
r13888
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073 Test list of commands with command with no help text
$ hg help helpext
helpext extension - no help text available
list of commands:
Olav Reinert
help: format command and option list help using RST...
r16853 nohelp (no help text available)
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Martin Geisler
commands: clarify which aliases "hg help -v" show (issue2572)
r13230 use "hg -v help helpext" to show builtin aliases and global options
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Test a help topic
$ hg help revs
Specifying Single Revisions
Dan Villiom Podlaski Christiansen
help: use a full header for topic titles...
r18748 """""""""""""""""""""""""""
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Mercurial supports several ways to specify individual revisions.
A plain integer is treated as a revision number. Negative integers are
treated as sequential offsets from the tip, with -1 denoting the tip, -2
denoting the revision prior to the tip, and so forth.
A 40-digit hexadecimal string is treated as a unique revision identifier.
A hexadecimal string less than 40 characters long is treated as a unique
revision identifier and is referred to as a short-form identifier. A
short-form identifier is only valid if it is the prefix of exactly one
full-length identifier.
Kevin Bullock
help: include bookmarks in 'help revisions' and simplify wording
r16740 Any other string is treated as a bookmark, tag, or branch name. A bookmark
is a movable pointer to a revision. A tag is a permanent name associated
with a revision. A branch name denotes the tipmost revision of that
branch. Bookmark, tag, and branch names must not contain the ":"
character.
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
Kevin Bullock
help: include bookmarks in 'help revisions' and simplify wording
r16740 The reserved name "tip" always identifies the most recent revision.
Dan Villiom Podlaski Christiansen
tests: unify test-help
r12073
The reserved name "null" indicates the null revision. This is the revision
of an empty repository, and the parent of revision 0.
The reserved name "." indicates the working directory parent. If no
working directory is checked out, it is equivalent to null. If an
uncommitted merge is in progress, "." is the revision of the first parent.
Patrick Mezard
help: add topic rewriting hooks...
r12820
Patrick Mezard
test-help: test a sample of 'templates' topic help
r13584 Test templating help
$ hg help templating | egrep '(desc|diffstat|firstline|nonempty) '
Olav Reinert
minirst: simplify and standardize field list formatting...
r15861 desc String. The text of the changeset description.
diffstat String. Statistics of changes with the following format:
firstline Any text. Returns the first line of text.
nonempty Any text. Returns '(none)' if the string is empty.
Patrick Mezard
test-help: test a sample of 'templates' topic help
r13584
Patrick Mezard
help: add topic rewriting hooks...
r12820 Test help hooks
$ cat > helphook1.py <<EOF
> from mercurial import help
>
> def rewrite(topic, doc):
> return doc + '\nhelphook1\n'
>
> def extsetup(ui):
> help.addtopichook('revsets', rewrite)
> EOF
$ cat > helphook2.py <<EOF
> from mercurial import help
>
> def rewrite(topic, doc):
> return doc + '\nhelphook2\n'
>
> def extsetup(ui):
> help.addtopichook('revsets', rewrite)
> EOF
$ echo '[extensions]' >> $HGRCPATH
$ echo "helphook1 = `pwd`/helphook1.py" >> $HGRCPATH
$ echo "helphook2 = `pwd`/helphook2.py" >> $HGRCPATH
$ hg help revsets | grep helphook
helphook1
helphook2
Olav Reinert
help: fix extension commands help in keyword search...
r16942
Test keyword search help
$ hg help -k clone
Topics:
config Configuration Files
extensions Using Additional Features
glossary Glossary
phases Working with Phases
Mads Kiilerich
help: use the first topic name from helptable, not the longest alias...
r17322 subrepos Subrepositories
Olav Reinert
help: fix extension commands help in keyword search...
r16942 urls URL Paths
Commands:
Kevin Bullock
tests: fix test-help.t for '@' bookmark documentation...
r18475 bookmarks track a line of development with movable markers
clone make a copy of an existing repository
paths show aliases for remote repositories
update update working directory (or switch revisions)
Olav Reinert
help: fix extension commands help in keyword search...
r16942
Extensions:
relink recreates hardlinks between repository clones
Extension Commands:
qclone clone main and patch repository at same time
FUJIWARA Katsunori
help: indicate help omitting if help document is not fully displayed...
r17837 Test omit indicating for help
$ cat > addverboseitems.py <<EOF
> '''extension to test omit indicating.
>
> This paragraph is never omitted (for extension)
>
> .. container:: verbose
>
> This paragraph is omitted,
> if :hg:\`help\` is invoked witout \`\`-v\`\` (for extension)
>
> This paragraph is never omitted, too (for extension)
> '''
>
> from mercurial import help, commands
> testtopic = """This paragraph is never omitted (for topic).
>
> .. container:: verbose
>
> This paragraph is omitted,
> if :hg:\`help\` is invoked witout \`\`-v\`\` (for topic)
>
> This paragraph is never omitted, too (for topic)
> """
> def extsetup(ui):
> help.helptable.append((["topic-containing-verbose"],
> "This is the topic to test omit indicating.",
> lambda : testtopic))
> EOF
$ echo '[extensions]' >> $HGRCPATH
$ echo "addverboseitems = `pwd`/addverboseitems.py" >> $HGRCPATH
$ hg help addverboseitems
addverboseitems extension - extension to test omit indicating.
This paragraph is never omitted (for extension)
This paragraph is never omitted, too (for extension)
use "hg help -v addverboseitems" to show more complete help
no commands defined
$ hg help -v addverboseitems
addverboseitems extension - extension to test omit indicating.
This paragraph is never omitted (for extension)
This paragraph is omitted, if "hg help" is invoked witout "-v" (for extension)
This paragraph is never omitted, too (for extension)
no commands defined
$ hg help topic-containing-verbose
This is the topic to test omit indicating.
Dan Villiom Podlaski Christiansen
help: use a full header for topic titles...
r18748 """"""""""""""""""""""""""""""""""""""""""
FUJIWARA Katsunori
help: indicate help omitting if help document is not fully displayed...
r17837
This paragraph is never omitted (for topic).
This paragraph is never omitted, too (for topic)
use "hg help -v topic-containing-verbose" to show more complete help
$ hg help -v topic-containing-verbose
This is the topic to test omit indicating.
Dan Villiom Podlaski Christiansen
help: use a full header for topic titles...
r18748 """"""""""""""""""""""""""""""""""""""""""
FUJIWARA Katsunori
help: indicate help omitting if help document is not fully displayed...
r17837
This paragraph is never omitted (for topic).
This paragraph is omitted, if "hg help" is invoked witout "-v" (for topic)
This paragraph is never omitted, too (for topic)
FUJIWARA Katsunori
doc: add the tool to check section marks in help documents...
r17648 Test usage of section marks in help documents
$ cd "$TESTDIR"/../doc
$ python check-seclevel.py
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 $ cd $TESTTMP
#if serve
Test the help pages in hgweb.
Dish up an empty repo; serve it cold.
$ hg init "$TESTTMP/test"
$ hg serve -R "$TESTTMP/test" -n test -p $HGPORT -d --pid-file=hg.pid
$ cat hg.pid >> $DAEMON_PIDS
$ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help"
200 Script output follows
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<script type="text/javascript" src="/static/mercurial.js"></script>
<title>Help: Index</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
<a href="http://mercurial.selenic.com/">
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
<li><a href="/shortlog">log</a></li>
<li><a href="/graph">graph</a></li>
<li><a href="/tags">tags</a></li>
<li><a href="/bookmarks">bookmarks</a></li>
<li><a href="/branches">branches</a></li>
</ul>
<ul>
<li class="active">help</li>
</ul>
</div>
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
</form>
<table class="bigtable">
<tr><td colspan="2"><h2><a name="main" href="#topics">Topics</a></h2></td></tr>
Dan Villiom Podlaski Christiansen
hgweb help: split up long lines (in generated output)
r18745
<tr><td>
<a href="/help/config">
config
</a>
</td><td>
Configuration Files
</td></tr>
<tr><td>
<a href="/help/dates">
dates
</a>
</td><td>
Date Formats
</td></tr>
<tr><td>
<a href="/help/diffs">
diffs
</a>
</td><td>
Diff Formats
</td></tr>
<tr><td>
<a href="/help/environment">
environment
</a>
</td><td>
Environment Variables
</td></tr>
<tr><td>
<a href="/help/extensions">
extensions
</a>
</td><td>
Using Additional Features
</td></tr>
<tr><td>
<a href="/help/filesets">
filesets
</a>
</td><td>
Specifying File Sets
</td></tr>
<tr><td>
<a href="/help/glossary">
glossary
</a>
</td><td>
Glossary
</td></tr>
<tr><td>
<a href="/help/hgignore">
hgignore
</a>
</td><td>
Syntax for Mercurial Ignore Files
</td></tr>
<tr><td>
<a href="/help/hgweb">
hgweb
</a>
</td><td>
Configuring hgweb
</td></tr>
<tr><td>
<a href="/help/merge-tools">
merge-tools
</a>
</td><td>
Merge Tools
</td></tr>
<tr><td>
<a href="/help/multirevs">
multirevs
</a>
</td><td>
Specifying Multiple Revisions
</td></tr>
<tr><td>
<a href="/help/patterns">
patterns
</a>
</td><td>
File Name Patterns
</td></tr>
<tr><td>
<a href="/help/phases">
phases
</a>
</td><td>
Working with Phases
</td></tr>
<tr><td>
<a href="/help/revisions">
revisions
</a>
</td><td>
Specifying Single Revisions
</td></tr>
<tr><td>
<a href="/help/revsets">
revsets
</a>
</td><td>
Specifying Revision Sets
</td></tr>
<tr><td>
<a href="/help/subrepos">
subrepos
</a>
</td><td>
Subrepositories
</td></tr>
<tr><td>
<a href="/help/templating">
templating
</a>
</td><td>
Template Usage
</td></tr>
<tr><td>
<a href="/help/urls">
urls
</a>
</td><td>
URL Paths
</td></tr>
<tr><td>
<a href="/help/topic-containing-verbose">
topic-containing-verbose
</a>
</td><td>
This is the topic to test omit indicating.
</td></tr>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744
<tr><td colspan="2"><h2><a name="main" href="#main">Main Commands</a></h2></td></tr>
Dan Villiom Podlaski Christiansen
hgweb help: split up long lines (in generated output)
r18745
<tr><td>
<a href="/help/add">
add
</a>
</td><td>
add the specified files on the next commit
</td></tr>
<tr><td>
<a href="/help/annotate">
annotate
</a>
</td><td>
show changeset information by line for each file
</td></tr>
<tr><td>
<a href="/help/clone">
clone
</a>
</td><td>
make a copy of an existing repository
</td></tr>
<tr><td>
<a href="/help/commit">
commit
</a>
</td><td>
commit the specified files or all outstanding changes
</td></tr>
<tr><td>
<a href="/help/diff">
diff
</a>
</td><td>
diff repository (or selected files)
</td></tr>
<tr><td>
<a href="/help/export">
export
</a>
</td><td>
dump the header and diffs for one or more changesets
</td></tr>
<tr><td>
<a href="/help/forget">
forget
</a>
</td><td>
forget the specified files on the next commit
</td></tr>
<tr><td>
<a href="/help/init">
init
</a>
</td><td>
create a new repository in the given directory
</td></tr>
<tr><td>
<a href="/help/log">
log
</a>
</td><td>
show revision history of entire repository or files
</td></tr>
<tr><td>
<a href="/help/merge">
merge
</a>
</td><td>
merge working directory with another revision
</td></tr>
<tr><td>
<a href="/help/pull">
pull
</a>
</td><td>
pull changes from the specified source
</td></tr>
<tr><td>
<a href="/help/push">
push
</a>
</td><td>
push changes to the specified destination
</td></tr>
<tr><td>
<a href="/help/remove">
remove
</a>
</td><td>
remove the specified files on the next commit
</td></tr>
<tr><td>
<a href="/help/serve">
serve
</a>
</td><td>
start stand-alone webserver
</td></tr>
<tr><td>
<a href="/help/status">
status
</a>
</td><td>
show changed files in the working directory
</td></tr>
<tr><td>
<a href="/help/summary">
summary
</a>
</td><td>
summarize working directory state
</td></tr>
<tr><td>
<a href="/help/update">
update
</a>
</td><td>
update working directory (or switch revisions)
</td></tr>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744
<tr><td colspan="2"><h2><a name="other" href="#other">Other Commands</a></h2></td></tr>
Dan Villiom Podlaski Christiansen
hgweb help: split up long lines (in generated output)
r18745
<tr><td>
<a href="/help/addremove">
addremove
</a>
</td><td>
add all new files, delete all missing files
</td></tr>
<tr><td>
<a href="/help/archive">
archive
</a>
</td><td>
create an unversioned archive of a repository revision
</td></tr>
<tr><td>
<a href="/help/backout">
backout
</a>
</td><td>
reverse effect of earlier changeset
</td></tr>
<tr><td>
<a href="/help/bisect">
bisect
</a>
</td><td>
subdivision search of changesets
</td></tr>
<tr><td>
<a href="/help/bookmarks">
bookmarks
</a>
</td><td>
track a line of development with movable markers
</td></tr>
<tr><td>
<a href="/help/branch">
branch
</a>
</td><td>
set or show the current branch name
</td></tr>
<tr><td>
<a href="/help/branches">
branches
</a>
</td><td>
list repository named branches
</td></tr>
<tr><td>
<a href="/help/bundle">
bundle
</a>
</td><td>
create a changegroup file
</td></tr>
<tr><td>
<a href="/help/cat">
cat
</a>
</td><td>
output the current or given revision of files
</td></tr>
<tr><td>
<a href="/help/copy">
copy
</a>
</td><td>
mark files as copied for the next commit
</td></tr>
<tr><td>
<a href="/help/graft">
graft
</a>
</td><td>
copy changes from other branches onto the current branch
</td></tr>
<tr><td>
<a href="/help/grep">
grep
</a>
</td><td>
search for a pattern in specified files and revisions
</td></tr>
<tr><td>
<a href="/help/heads">
heads
</a>
</td><td>
show current repository heads or show branch heads
</td></tr>
<tr><td>
<a href="/help/help">
help
</a>
</td><td>
show help for a given topic or a help overview
</td></tr>
<tr><td>
<a href="/help/identify">
identify
</a>
</td><td>
identify the working copy or specified revision
</td></tr>
<tr><td>
<a href="/help/import">
import
</a>
</td><td>
import an ordered set of patches
</td></tr>
<tr><td>
<a href="/help/incoming">
incoming
</a>
</td><td>
show new changesets found in source
</td></tr>
<tr><td>
<a href="/help/locate">
locate
</a>
</td><td>
locate files matching specific patterns
</td></tr>
<tr><td>
<a href="/help/manifest">
manifest
</a>
</td><td>
output the current or given revision of the project manifest
</td></tr>
<tr><td>
<a href="/help/nohelp">
nohelp
</a>
</td><td>
(no help text available)
</td></tr>
<tr><td>
<a href="/help/outgoing">
outgoing
</a>
</td><td>
show changesets not found in the destination
</td></tr>
<tr><td>
<a href="/help/parents">
parents
</a>
</td><td>
show the parents of the working directory or revision
</td></tr>
<tr><td>
<a href="/help/paths">
paths
</a>
</td><td>
show aliases for remote repositories
</td></tr>
<tr><td>
<a href="/help/phase">
phase
</a>
</td><td>
set or show the current phase name
</td></tr>
<tr><td>
<a href="/help/recover">
recover
</a>
</td><td>
roll back an interrupted transaction
</td></tr>
<tr><td>
<a href="/help/rename">
rename
</a>
</td><td>
rename files; equivalent of copy + remove
</td></tr>
<tr><td>
<a href="/help/resolve">
resolve
</a>
</td><td>
redo merges or set/view the merge status of files
</td></tr>
<tr><td>
<a href="/help/revert">
revert
</a>
</td><td>
restore files to their checkout state
</td></tr>
<tr><td>
<a href="/help/rollback">
rollback
</a>
</td><td>
roll back the last transaction (dangerous)
</td></tr>
<tr><td>
<a href="/help/root">
root
</a>
</td><td>
print the root (top) of the current working directory
</td></tr>
<tr><td>
<a href="/help/showconfig">
showconfig
</a>
</td><td>
show combined config settings from all hgrc files
</td></tr>
<tr><td>
<a href="/help/tag">
tag
</a>
</td><td>
add one or more tags for the current or given revision
</td></tr>
<tr><td>
<a href="/help/tags">
tags
</a>
</td><td>
list repository tags
</td></tr>
<tr><td>
<a href="/help/tip">
tip
</a>
</td><td>
show the tip revision
</td></tr>
<tr><td>
<a href="/help/unbundle">
unbundle
</a>
</td><td>
apply one or more changegroup files
</td></tr>
<tr><td>
<a href="/help/verify">
verify
</a>
</td><td>
verify the integrity of the repository
</td></tr>
<tr><td>
<a href="/help/version">
version
</a>
</td><td>
output version and copyright information
</td></tr>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 </table>
</div>
</div>
<script type="text/javascript">process_dates()</script>
</body>
</html>
$ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/add"
200 Script output follows
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<script type="text/javascript" src="/static/mercurial.js"></script>
<title>Help: add</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
<a href="http://mercurial.selenic.com/">
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
<li><a href="/shortlog">log</a></li>
<li><a href="/graph">graph</a></li>
<li><a href="/tags">tags</a></li>
<li><a href="/bookmarks">bookmarks</a></li>
<li><a href="/branches">branches</a></li>
</ul>
<ul>
<li class="active"><a href="/help">help</a></li>
</ul>
</div>
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>Help: add</h3>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
</form>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 <div id="doc">
<p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 hg add [OPTION]... [FILE]...
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 add the specified files on the next commit
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<p>
Schedule files to be version controlled and added to the
repository.
</p>
<p>
The files will be added to the repository at the next commit. To
Dan Villiom Podlaski Christiansen
minirst: CGI escape strings prior to embedding it in the HTML
r18750 undo an add before that, see &quot;hg forget&quot;.
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<p>
If no names are given, add all files to the repository.
</p>
<p>
Alexander Plavin
hgweb: make help verbose again (issue3899)...
r19079 An example showing how new (unknown) files are added
automatically by &quot;hg add&quot;:
</p>
<pre>
\$ ls (re)
foo.c
\$ hg status (re)
? foo.c
\$ hg add (re)
adding foo.c
\$ hg status (re)
A foo.c
</pre>
<p>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 Returns 0 if all files are successfully added.
</p>
<p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 options:
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<table>
Dan Villiom Podlaski Christiansen
minirst: HTML formatter tweaks...
r18751 <tr><td>-I</td>
<td>--include PATTERN [+]</td>
<td>include names matching the given patterns</td></tr>
<tr><td>-X</td>
<td>--exclude PATTERN [+]</td>
<td>exclude names matching the given patterns</td></tr>
<tr><td>-S</td>
<td>--subrepos</td>
<td>recurse into subrepositories</td></tr>
<tr><td>-n</td>
<td>--dry-run</td>
<td>do not perform actions, just print output</td></tr>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </table>
<p>
[+] marked option can be specified multiple times
</p>
<p>
global options:
</p>
<table>
Dan Villiom Podlaski Christiansen
minirst: HTML formatter tweaks...
r18751 <tr><td>-R</td>
<td>--repository REPO</td>
<td>repository root directory or name of overlay bundle file</td></tr>
<tr><td></td>
<td>--cwd DIR</td>
<td>change working directory</td></tr>
<tr><td>-y</td>
<td>--noninteractive</td>
<td>do not prompt, automatically pick the first choice for all prompts</td></tr>
<tr><td>-q</td>
<td>--quiet</td>
<td>suppress output</td></tr>
<tr><td>-v</td>
<td>--verbose</td>
<td>enable additional output</td></tr>
<tr><td></td>
<td>--config CONFIG [+]</td>
<td>set/override config option (use 'section.name=value')</td></tr>
<tr><td></td>
<td>--debug</td>
<td>enable debugging output</td></tr>
<tr><td></td>
<td>--debugger</td>
<td>start debugger</td></tr>
<tr><td></td>
<td>--encoding ENCODE</td>
<td>set the charset encoding (default: ascii)</td></tr>
<tr><td></td>
<td>--encodingmode MODE</td>
<td>set the charset encoding mode (default: strict)</td></tr>
<tr><td></td>
<td>--traceback</td>
<td>always print a traceback on exception</td></tr>
<tr><td></td>
<td>--time</td>
<td>time how long the command takes</td></tr>
<tr><td></td>
<td>--profile</td>
<td>print command execution profile</td></tr>
<tr><td></td>
<td>--version</td>
<td>output version information and exit</td></tr>
<tr><td>-h</td>
<td>--help</td>
<td>display help and exit</td></tr>
<tr><td></td>
<td>--hidden</td>
<td>consider hidden changesets</td></tr>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </table>
<p>
[+] marked option can be specified multiple times
</p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </div>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 </div>
</div>
<script type="text/javascript">process_dates()</script>
</body>
</html>
$ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/remove"
200 Script output follows
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<script type="text/javascript" src="/static/mercurial.js"></script>
<title>Help: remove</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
<a href="http://mercurial.selenic.com/">
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
<li><a href="/shortlog">log</a></li>
<li><a href="/graph">graph</a></li>
<li><a href="/tags">tags</a></li>
<li><a href="/bookmarks">bookmarks</a></li>
<li><a href="/branches">branches</a></li>
</ul>
<ul>
<li class="active"><a href="/help">help</a></li>
</ul>
</div>
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>Help: remove</h3>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
</form>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 <div id="doc">
<p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 hg remove [OPTION]... FILE...
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 aliases: rm
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 remove the specified files on the next commit
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<p>
Schedule the indicated files for removal from the current branch.
</p>
<p>
This command schedules the files to be removed at the next commit.
Dan Villiom Podlaski Christiansen
minirst: CGI escape strings prior to embedding it in the HTML
r18750 To undo a remove before that, see &quot;hg revert&quot;. To undo added
files, see &quot;hg forget&quot;.
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<p>
Alexander Plavin
hgweb: make help verbose again (issue3899)...
r19079 -A/--after can be used to remove only files that have already
been deleted, -f/--force can be used to force deletion, and -Af
can be used to remove files from the next revision without
deleting them from the working directory.
</p>
<p>
The following table details the behavior of remove for different
file states (columns) and option combinations (rows). The file
states are Added [A], Clean [C], Modified [M] and Missing [!]
(as reported by &quot;hg status&quot;). The actions are Warn, Remove
(from branch) and Delete (from disk):
</p>
<table>
<tr><td></td>
<td>A</td>
<td>C</td>
<td>M</td>
<td>!</td></tr>
<tr><td>none</td>
<td>W</td>
<td>RD</td>
<td>W</td>
<td>R</td></tr>
<tr><td>-f</td>
<td>R</td>
<td>RD</td>
<td>RD</td>
<td>R</td></tr>
<tr><td>-A</td>
<td>W</td>
<td>W</td>
<td>W</td>
<td>R</td></tr>
<tr><td>-Af</td>
<td>R</td>
<td>R</td>
<td>R</td>
<td>R</td></tr>
</table>
<p>
Note that remove never deletes files in Added [A] state from the
working directory, not even if option --force is specified.
</p>
<p>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 Returns 0 on success, 1 if any warnings encountered.
</p>
<p>
options:
</p>
<table>
Dan Villiom Podlaski Christiansen
minirst: HTML formatter tweaks...
r18751 <tr><td>-A</td>
<td>--after</td>
<td>record delete for missing files</td></tr>
<tr><td>-f</td>
<td>--force</td>
<td>remove (and delete) file even if added or modified</td></tr>
<tr><td>-I</td>
<td>--include PATTERN [+]</td>
<td>include names matching the given patterns</td></tr>
<tr><td>-X</td>
<td>--exclude PATTERN [+]</td>
<td>exclude names matching the given patterns</td></tr>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </table>
<p>
[+] marked option can be specified multiple times
</p>
<p>
global options:
</p>
<table>
Dan Villiom Podlaski Christiansen
minirst: HTML formatter tweaks...
r18751 <tr><td>-R</td>
<td>--repository REPO</td>
<td>repository root directory or name of overlay bundle file</td></tr>
<tr><td></td>
<td>--cwd DIR</td>
<td>change working directory</td></tr>
<tr><td>-y</td>
<td>--noninteractive</td>
<td>do not prompt, automatically pick the first choice for all prompts</td></tr>
<tr><td>-q</td>
<td>--quiet</td>
<td>suppress output</td></tr>
<tr><td>-v</td>
<td>--verbose</td>
<td>enable additional output</td></tr>
<tr><td></td>
<td>--config CONFIG [+]</td>
<td>set/override config option (use 'section.name=value')</td></tr>
<tr><td></td>
<td>--debug</td>
<td>enable debugging output</td></tr>
<tr><td></td>
<td>--debugger</td>
<td>start debugger</td></tr>
<tr><td></td>
<td>--encoding ENCODE</td>
<td>set the charset encoding (default: ascii)</td></tr>
<tr><td></td>
<td>--encodingmode MODE</td>
<td>set the charset encoding mode (default: strict)</td></tr>
<tr><td></td>
<td>--traceback</td>
<td>always print a traceback on exception</td></tr>
<tr><td></td>
<td>--time</td>
<td>time how long the command takes</td></tr>
<tr><td></td>
<td>--profile</td>
<td>print command execution profile</td></tr>
<tr><td></td>
<td>--version</td>
<td>output version information and exit</td></tr>
<tr><td>-h</td>
<td>--help</td>
<td>display help and exit</td></tr>
<tr><td></td>
<td>--hidden</td>
<td>consider hidden changesets</td></tr>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </table>
<p>
[+] marked option can be specified multiple times
</p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </div>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 </div>
</div>
<script type="text/javascript">process_dates()</script>
</body>
</html>
$ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT "help/revisions"
200 Script output follows
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<link rel="icon" href="/static/hgicon.png" type="image/png" />
<meta name="robots" content="index, nofollow" />
<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
<script type="text/javascript" src="/static/mercurial.js"></script>
<title>Help: revisions</title>
</head>
<body>
<div class="container">
<div class="menu">
<div class="logo">
<a href="http://mercurial.selenic.com/">
<img src="/static/hglogo.png" alt="mercurial" /></a>
</div>
<ul>
<li><a href="/shortlog">log</a></li>
<li><a href="/graph">graph</a></li>
<li><a href="/tags">tags</a></li>
<li><a href="/bookmarks">bookmarks</a></li>
<li><a href="/branches">branches</a></li>
</ul>
<ul>
<li class="active"><a href="/help">help</a></li>
</ul>
</div>
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>Help: revisions</h3>
<form class="search" action="/log">
<p><input name="rev" id="search1" type="text" size="30" /></p>
<div id="hint">find changesets by author, revision,
files, or words in the commit message</div>
</form>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 <div id="doc">
Dan Villiom Podlaski Christiansen
help: use a full header for topic titles...
r18748 <h1>Specifying Single Revisions</h1>
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 <p>
Mercurial supports several ways to specify individual revisions.
</p>
<p>
A plain integer is treated as a revision number. Negative integers are
treated as sequential offsets from the tip, with -1 denoting the tip,
-2 denoting the revision prior to the tip, and so forth.
</p>
<p>
A 40-digit hexadecimal string is treated as a unique revision
identifier.
</p>
<p>
A hexadecimal string less than 40 characters long is treated as a
unique revision identifier and is referred to as a short-form
identifier. A short-form identifier is only valid if it is the prefix
of exactly one full-length identifier.
</p>
<p>
Any other string is treated as a bookmark, tag, or branch name. A
bookmark is a movable pointer to a revision. A tag is a permanent name
associated with a revision. A branch name denotes the tipmost revision
Dan Villiom Podlaski Christiansen
minirst: CGI escape strings prior to embedding it in the HTML
r18750 of that branch. Bookmark, tag, and branch names must not contain the &quot;:&quot;
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 character.
</p>
<p>
Dan Villiom Podlaski Christiansen
minirst: CGI escape strings prior to embedding it in the HTML
r18750 The reserved name &quot;tip&quot; always identifies the most recent revision.
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </p>
<p>
Dan Villiom Podlaski Christiansen
minirst: CGI escape strings prior to embedding it in the HTML
r18750 The reserved name &quot;null&quot; indicates the null revision. This is the
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 revision of an empty repository, and the parent of revision 0.
</p>
<p>
Dan Villiom Podlaski Christiansen
minirst: CGI escape strings prior to embedding it in the HTML
r18750 The reserved name &quot;.&quot; indicates the working directory parent. If no
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 working directory is checked out, it is equivalent to null. If an
Dan Villiom Podlaski Christiansen
minirst: CGI escape strings prior to embedding it in the HTML
r18750 uncommitted merge is in progress, &quot;.&quot; is the revision of the first
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 parent.
</p>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744
Dan Villiom Podlaski Christiansen
hgweb: generate HTML documentation...
r18747 </div>
Dan Villiom Podlaski Christiansen
hgweb help: add tests
r18744 </div>
</div>
<script type="text/javascript">process_dates()</script>
</body>
</html>
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
#endif