summaryrefslogtreecommitdiff
path: root/doc/hgrc.5
diff options
context:
space:
mode:
Diffstat (limited to 'doc/hgrc.5')
-rw-r--r--doc/hgrc.5590
1 files changed, 211 insertions, 379 deletions
diff --git a/doc/hgrc.5 b/doc/hgrc.5
index 8d17bef..8fd0013 100644
--- a/doc/hgrc.5
+++ b/doc/hgrc.5
@@ -65,7 +65,7 @@ paths are given below, settings from earlier paths override later
ones.
.sp
.nf
-(All) \fB<repo>/.hg/hgrc\fP
+(Unix, Windows) \fB<repo>/.hg/hgrc\fP
.fi
.sp
.INDENT 0.0
@@ -75,14 +75,13 @@ Per\-repository configuration options that only apply in a
particular repository. This file is not version\-controlled, and
will not get transferred during a "clone" operation. Options in
this file override options in all other configuration files. On
-Plan 9 and Unix, most of this file will be ignored if it doesn\(aqt
-belong to a trusted user or to a trusted group. See the documentation
-for the \fB[trusted]\fP section below for more details.
+Unix, most of this file will be ignored if it doesn\(aqt belong to a
+trusted user or to a trusted group. See the documentation for the
+\fB[trusted]\fP section below for more details.
.UNINDENT
.UNINDENT
.sp
.nf
-(Plan 9) \fB$home/lib/hgrc\fP
(Unix) \fB$HOME/.hgrc\fP
(Windows) \fB%USERPROFILE%\e.hgrc\fP
(Windows) \fB%USERPROFILE%\eMercurial.ini\fP
@@ -102,8 +101,6 @@ options.
.UNINDENT
.sp
.nf
-(Plan 9) \fB/lib/mercurial/hgrc\fP
-(Plan 9) \fB/lib/mercurial/hgrc.d/*.rc\fP
(Unix) \fB/etc/mercurial/hgrc\fP
(Unix) \fB/etc/mercurial/hgrc.d/*.rc\fP
.fi
@@ -119,8 +116,6 @@ override per\-installation options.
.UNINDENT
.sp
.nf
-(Plan 9) \fB<install\-root>/lib/mercurial/hgrc\fP
-(Plan 9) \fB<install\-root>/lib/mercurial/hgrc.d/*.rc\fP
(Unix) \fB<install\-root>/etc/mercurial/hgrc\fP
(Unix) \fB<install\-root>/etc/mercurial/hgrc.d/*.rc\fP
.fi
@@ -152,7 +147,9 @@ Mercurial commands executed by any user in any directory. Registry
keys contain PATH\-like strings, every part of which must reference
a \fBMercurial.ini\fP file or be a directory where \fB*.rc\fP files will
be read. Mercurial checks each of these locations in the specified
-order until one or more configuration files are detected.
+order until one or more configuration files are detected. If the
+pywin32 extensions are not installed, Mercurial will only look for
+site\-wide configuration in \fBC:\eMercurial\eMercurial.ini\fP.
.UNINDENT
.UNINDENT
.SH SYNTAX
@@ -310,7 +307,7 @@ run arbitrary commands. As an example,
.sp
.nf
.ft C
-echo = !echo $@
+echo = !echo
.ft P
.fi
.sp
@@ -326,43 +323,12 @@ purge = !$HG status \-\-no\-status \-\-unknown \-0 | xargs \-0 rm
which will make \fBhg purge\fP delete all unknown files in the
repository in the same manner as the purge extension.
.sp
-Positional arguments like \fB$1\fP, \fB$2\fP, etc. in the alias definition
-expand to the command arguments. Unmatched arguments are
-removed. \fB$0\fP expands to the alias name and \fB$@\fP expands to all
-arguments separated by a space. These expansions happen before the
-command is passed to the shell.
-.sp
-Shell aliases are executed in an environment where \fB$HG\fP expands to
+Shell aliases are executed in an environment where \fB$HG\fP expand to
the path of the Mercurial that was used to execute the alias. This is
useful when you want to call further Mercurial commands in a shell
alias, as was done above for the purge alias. In addition,
-\fB$HG_ARGS\fP expands to the arguments given to Mercurial. In the \fBhg
+\fB$HG_ARGS\fP expand to the arguments given to Mercurial. In the \fBhg
echo foo\fP call above, \fB$HG_ARGS\fP would expand to \fBecho foo\fP.
-.IP Note
-.
-Some global configuration options such as \fB\-R\fP are
-processed before shell aliases and will thus not be passed to
-aliases.
-.RE
-.SS \fBannotate\fP
-.sp
-Settings used when displaying file annotations. All values are
-Booleans and default to False. See \fBdiff\fP section for related
-options for the diff command.
-.INDENT 0.0
-.TP
-.B \fBignorews\fP
-.sp
-Ignore white space when comparing lines.
-.TP
-.B \fBignorewsamount\fP
-.sp
-Ignore changes in the amount of white space.
-.TP
-.B \fBignoreblanklines\fP
-.sp
-Ignore changes whose lines are all blank.
-.UNINDENT
.SS \fBauth\fP
.sp
Authentication credentials for HTTP authentication. This section
@@ -516,9 +482,8 @@ defining command defaults. The command defaults will also be applied
to the aliases of the commands defined.
.SS \fBdiff\fP
.sp
-Settings used when displaying diffs. Everything except for \fBunified\fP
-is a Boolean and defaults to False. See \fBannotate\fP section for
-related options for the annotate command.
+Settings used when displaying diffs. Everything except for \fBunified\fP is a
+Boolean and defaults to False.
.INDENT 0.0
.TP
.B \fBgit\fP
@@ -652,6 +617,25 @@ mq =
myfeature = ~/.hgext/myfeature.py
.ft P
.fi
+.SS \fBhostfingerprints\fP
+.sp
+Fingerprints of the certificates of known HTTPS servers.
+A HTTPS connection to a server with a fingerprint configured here will
+only succeed if the servers certificate matches the fingerprint.
+This is very similar to how ssh known hosts works.
+The fingerprint is the SHA\-1 hash value of the DER encoded certificate.
+The CA chain and web.cacerts is not used for servers with a fingerprint.
+.sp
+For example:
+.sp
+.nf
+.ft C
+[hostfingerprints]
+hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc
+.ft P
+.fi
+.sp
+This feature is only supported when using Python 2.6 or later.
.SS \fBformat\fP
.INDENT 0.0
.TP
@@ -682,43 +666,146 @@ Mac OS X and spaces on Windows. Enabled by default. Disabling this
option ensures that the on\-disk format of newly created
repositories will be compatible with Mercurial before version 1.7.
.UNINDENT
-.SS \fBgraph\fP
+.SS \fBmerge\-patterns\fP
.sp
-Web graph view configuration. This section let you change graph
-elements display properties by branches, for instance to make the
-\fBdefault\fP branch stand out.
+This section specifies merge tools to associate with particular file
+patterns. Tools matched here will take precedence over the default
+merge tool. Patterns are globs by default, rooted at the repository
+root.
.sp
-Each line has the following format:
+Example:
.sp
.nf
.ft C
-<branch>.<argument> = <value>
+[merge\-patterns]
+**.c = kdiff3
+**.jpg = myimgmerge
.ft P
.fi
+.SS \fBmerge\-tools\fP
.sp
-where \fB<branch>\fP is the name of the branch being
-customized. Example:
+This section configures external merge tools to use for file\-level
+merges.
+.sp
+Example \fB~/.hgrc\fP:
.sp
.nf
.ft C
-[graph]
-# 2px width
-default.width = 2
-# red color
-default.color = FF0000
+[merge\-tools]
+# Override stock tool location
+kdiff3.executable = ~/bin/kdiff3
+# Specify command line
+kdiff3.args = $base $local $other \-o $output
+# Give higher priority
+kdiff3.priority = 1
+
+# Define new tool
+myHtmlTool.args = \-m $local $other $base $output
+myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
+myHtmlTool.priority = 1
.ft P
.fi
.sp
Supported arguments:
.INDENT 0.0
.TP
-.B \fBwidth\fP
+.B \fBpriority\fP
+.sp
+The priority in which to evaluate this tool.
+Default: 0.
+.TP
+.B \fBexecutable\fP
+.sp
+Either just the name of the executable or its pathname. On Windows,
+the path can use environment variables with ${ProgramFiles} syntax.
+Default: the tool name.
+.TP
+.B \fBargs\fP
+.sp
+The arguments to pass to the tool executable. You can refer to the
+files being merged as well as the output file through these
+variables: \fB$base\fP, \fB$local\fP, \fB$other\fP, \fB$output\fP.
+Default: \fB$local $base $other\fP
+.TP
+.B \fBpremerge\fP
+.sp
+Attempt to run internal non\-interactive 3\-way merge tool before
+launching external tool. Options are \fBtrue\fP, \fBfalse\fP, or \fBkeep\fP
+to leave markers in the file if the premerge fails.
+Default: True
+.TP
+.B \fBbinary\fP
.sp
-Set branch edges width in pixels.
+This tool can merge binary files. Defaults to False, unless tool
+was selected by file pattern match.
.TP
-.B \fBcolor\fP
+.B \fBsymlink\fP
.sp
-Set branch edges color in hexadecimal RGB notation.
+This tool can merge symlinks. Defaults to False, even if tool was
+selected by file pattern match.
+.TP
+.B \fBcheck\fP
+.sp
+A list of merge success\-checking options:
+.INDENT 7.0
+.TP
+.B \fBchanged\fP
+.sp
+Ask whether merge was successful when the merged file shows no changes.
+.TP
+.B \fBconflicts\fP
+.sp
+Check whether there are conflicts even though the tool reported success.
+.TP
+.B \fBprompt\fP
+.sp
+Always prompt for merge success, regardless of success reported by tool.
+.UNINDENT
+.TP
+.B \fBcheckchanged\fP
+.sp
+True is equivalent to \fBcheck = changed\fP.
+Default: False
+.TP
+.B \fBcheckconflicts\fP
+.sp
+True is equivalent to \fBcheck = conflicts\fP.
+Default: False
+.TP
+.B \fBfixeol\fP
+.sp
+Attempt to fix up EOL changes caused by the merge tool.
+Default: False
+.TP
+.B \fBgui\fP
+.sp
+This tool requires a graphical interface to run. Default: False
+.TP
+.B \fBregkey\fP
+.sp
+Windows registry key which describes install location of this
+tool. Mercurial will search for this key first under
+\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
+Default: None
+.TP
+.B \fBregkeyalt\fP
+.sp
+An alternate Windows registry key to try if the first key is not
+found. The alternate key uses the same \fBregname\fP and \fBregappend\fP
+semantics of the primary key. The most common use for this key
+is to search for 32bit applications on 64bit operating systems.
+Default: None
+.TP
+.B \fBregname\fP
+.sp
+Name of value to read from specified registry key. Defaults to the
+unnamed (default) value.
+.TP
+.B \fBregappend\fP
+.sp
+String to append to the value read from the registry, typically
+the executable name of the tool.
+Default: None
.UNINDENT
.SS \fBhooks\fP
.sp
@@ -726,10 +813,7 @@ Commands or Python functions that get automatically executed by
various actions such as starting or finishing a commit. Multiple
hooks can be run for the same action by appending a suffix to the
action. Overriding a site\-wide hook can be done by changing its
-value or setting it to an empty string. Hooks can be prioritized
-by adding a prefix of \fBpriority\fP to the hook name on a new line
-and setting the priority. The default priority is 0 if
-not specified.
+value or setting it to an empty string.
.sp
Example \fB.hg/hgrc\fP:
.sp
@@ -742,8 +826,6 @@ changegroup.update = hg update
incoming =
incoming.email = /my/email/hook
incoming.autobuild = /my/build/hook
-# force autobuild hook to run before other incoming hooks
-priority.incoming.autobuild = 1
.ft P
.fi
.sp
@@ -929,25 +1011,6 @@ environment variables above are passed as keyword arguments, with no
.sp
If a Python hook returns a "true" value or raises an exception, this
is treated as a failure.
-.SS \fBhostfingerprints\fP
-.sp
-Fingerprints of the certificates of known HTTPS servers.
-A HTTPS connection to a server with a fingerprint configured here will
-only succeed if the servers certificate matches the fingerprint.
-This is very similar to how ssh known hosts works.
-The fingerprint is the SHA\-1 hash value of the DER encoded certificate.
-The CA chain and web.cacerts is not used for servers with a fingerprint.
-.sp
-For example:
-.sp
-.nf
-.ft C
-[hostfingerprints]
-hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc
-.ft P
-.fi
-.sp
-This feature is only supported when using Python 2.6 or later.
.SS \fBhttp_proxy\fP
.sp
Used to access web\-based Mercurial repositories through a HTTP
@@ -977,146 +1040,39 @@ Optional. User name to authenticate with at the proxy server.
Optional. Always use the proxy, even for localhost and any entries
in \fBhttp_proxy.no\fP. True or False. Default: False.
.UNINDENT
-.SS \fBmerge\-patterns\fP
-.sp
-This section specifies merge tools to associate with particular file
-patterns. Tools matched here will take precedence over the default
-merge tool. Patterns are globs by default, rooted at the repository
-root.
-.sp
-Example:
-.sp
-.nf
-.ft C
-[merge\-patterns]
-**.c = kdiff3
-**.jpg = myimgmerge
-.ft P
-.fi
-.SS \fBmerge\-tools\fP
-.sp
-This section configures external merge tools to use for file\-level
-merges.
-.sp
-Example \fB~/.hgrc\fP:
-.sp
-.nf
-.ft C
-[merge\-tools]
-# Override stock tool location
-kdiff3.executable = ~/bin/kdiff3
-# Specify command line
-kdiff3.args = $base $local $other \-o $output
-# Give higher priority
-kdiff3.priority = 1
-
-# Define new tool
-myHtmlTool.args = \-m $local $other $base $output
-myHtmlTool.regkey = Software\eFooSoftware\eHtmlMerge
-myHtmlTool.priority = 1
-.ft P
-.fi
+.SS \fBsmtp\fP
.sp
-Supported arguments:
+Configuration for extensions that need to send email messages.
.INDENT 0.0
.TP
-.B \fBpriority\fP
-.sp
-The priority in which to evaluate this tool.
-Default: 0.
-.TP
-.B \fBexecutable\fP
-.sp
-Either just the name of the executable or its pathname. On Windows,
-the path can use environment variables with ${ProgramFiles} syntax.
-Default: the tool name.
-.TP
-.B \fBargs\fP
-.sp
-The arguments to pass to the tool executable. You can refer to the
-files being merged as well as the output file through these
-variables: \fB$base\fP, \fB$local\fP, \fB$other\fP, \fB$output\fP.
-Default: \fB$local $base $other\fP
-.TP
-.B \fBpremerge\fP
-.sp
-Attempt to run internal non\-interactive 3\-way merge tool before
-launching external tool. Options are \fBtrue\fP, \fBfalse\fP, or \fBkeep\fP
-to leave markers in the file if the premerge fails.
-Default: True
-.TP
-.B \fBbinary\fP
-.sp
-This tool can merge binary files. Defaults to False, unless tool
-was selected by file pattern match.
-.TP
-.B \fBsymlink\fP
-.sp
-This tool can merge symlinks. Defaults to False, even if tool was
-selected by file pattern match.
-.TP
-.B \fBcheck\fP
-.sp
-A list of merge success\-checking options:
-.INDENT 7.0
-.TP
-.B \fBchanged\fP
-.sp
-Ask whether merge was successful when the merged file shows no changes.
-.TP
-.B \fBconflicts\fP
-.sp
-Check whether there are conflicts even though the tool reported success.
-.TP
-.B \fBprompt\fP
-.sp
-Always prompt for merge success, regardless of success reported by tool.
-.UNINDENT
-.TP
-.B \fBcheckchanged\fP
-.sp
-True is equivalent to \fBcheck = changed\fP.
-Default: False
-.TP
-.B \fBcheckconflicts\fP
-.sp
-True is equivalent to \fBcheck = conflicts\fP.
-Default: False
-.TP
-.B \fBfixeol\fP
+.B \fBhost\fP
.sp
-Attempt to fix up EOL changes caused by the merge tool.
-Default: False
+Host name of mail server, e.g. "mail.example.com".
.TP
-.B \fBgui\fP
+.B \fBport\fP
.sp
-This tool requires a graphical interface to run. Default: False
+Optional. Port to connect to on mail server. Default: 25.
.TP
-.B \fBregkey\fP
+.B \fBtls\fP
.sp
-Windows registry key which describes install location of this
-tool. Mercurial will search for this key first under
-\fBHKEY_CURRENT_USER\fP and then under \fBHKEY_LOCAL_MACHINE\fP.
-Default: None
+Optional. Method to enable TLS when connecting to mail server: starttls,
+smtps or none. Default: none.
.TP
-.B \fBregkeyalt\fP
+.B \fBusername\fP
.sp
-An alternate Windows registry key to try if the first key is not
-found. The alternate key uses the same \fBregname\fP and \fBregappend\fP
-semantics of the primary key. The most common use for this key
-is to search for 32bit applications on 64bit operating systems.
-Default: None
+Optional. User name for authenticating with the SMTP server.
+Default: none.
.TP
-.B \fBregname\fP
+.B \fBpassword\fP
.sp
-Name of value to read from specified registry key. Defaults to the
-unnamed (default) value.
+Optional. Password for authenticating with the SMTP server. If not
+specified, interactive sessions will prompt the user for a
+password; non\-interactive sessions will fail. Default: none.
.TP
-.B \fBregappend\fP
+.B \fBlocal_hostname\fP
.sp
-String to append to the value read from the registry, typically
-the executable name of the tool.
-Default: None
+Optional. It\(aqs the hostname that the sender can use to identify
+itself to the MTA.
.UNINDENT
.SS \fBpatch\fP
.sp
@@ -1155,59 +1111,18 @@ cloned.
Optional. Directory or URL to use when pushing if no destination
is specified.
.UNINDENT
-.SS \fBphases\fP
-.sp
-Specifies default handling of phases. See \%\fBhg help phases\fP\: for more
-information about working with phases.
-.INDENT 0.0
-.TP
-.B \fBpublish\fP
-.sp
-Controls draft phase behavior when working as a server. When true,
-pushed changesets are set to public in both client and server and
-pulled or cloned changesets are set to public in the client.
-Default: True
-.TP
-.B \fBnew\-commit\fP
-.sp
-Phase of newly\-created commits.
-Default: draft
-.UNINDENT
.SS \fBprofiling\fP
.sp
-Specifies profiling type, format, and file output. Two profilers are
-supported: an instrumenting profiler (named \fBls\fP), and a sampling
-profiler (named \fBstat\fP).
-.sp
-In this section description, \(aqprofiling data\(aq stands for the raw data
-collected during profiling, while \(aqprofiling report\(aq stands for a
-statistical text report generated from the profiling data. The
-profiling is done using lsprof.
+Specifies profiling format and file output. In this section
+description, \(aqprofiling data\(aq stands for the raw data collected
+during profiling, while \(aqprofiling report\(aq stands for a statistical
+text report generated from the profiling data. The profiling is done
+using lsprof.
.INDENT 0.0
.TP
-.B \fBtype\fP
-.sp
-The type of profiler to use.
-Default: ls.
-.INDENT 7.0
-.TP
-.B \fBls\fP
-.sp
-Use Python\(aqs built\-in instrumenting profiler. This profiler
-works on all platforms, but each line number it reports is the
-first line of a function. This restriction makes it difficult to
-identify the expensive parts of a non\-trivial function.
-.TP
-.B \fBstat\fP
-.sp
-Use a third\-party statistical profiler, statprof. This profiler
-currently runs only on Unix systems, and is most useful for
-profiling commands that run for longer than about 0.1 seconds.
-.UNINDENT
-.TP
.B \fBformat\fP
.sp
-Profiling format. Specific to the \fBls\fP instrumenting profiler.
+Profiling format.
Default: text.
.INDENT 7.0
.TP
@@ -1224,11 +1139,6 @@ file, the generated file can directly be loaded into
kcachegrind.
.UNINDENT
.TP
-.B \fBfrequency\fP
-.sp
-Sampling frequency. Specific to the \fBstat\fP sampling profiler.
-Default: 1000.
-.TP
.B \fBoutput\fP
.sp
File path where profiling data or report should be saved. If the
@@ -1256,56 +1166,15 @@ extra data transfer overhead. This mode will also temporarily hold
the write lock while determining what data to transfer.
Default is True.
.TP
-.B \fBpreferuncompressed\fP
-.sp
-When set, clients will try to use the uncompressed streaming
-protocol. Default is False.
-.TP
.B \fBvalidate\fP
.sp
Whether to validate the completeness of pushed changesets by
checking that all new file revisions specified in manifests are
present. Default is False.
.UNINDENT
-.SS \fBsmtp\fP
-.sp
-Configuration for extensions that need to send email messages.
-.INDENT 0.0
-.TP
-.B \fBhost\fP
-.sp
-Host name of mail server, e.g. "mail.example.com".
-.TP
-.B \fBport\fP
-.sp
-Optional. Port to connect to on mail server. Default: 25.
-.TP
-.B \fBtls\fP
-.sp
-Optional. Method to enable TLS when connecting to mail server: starttls,
-smtps or none. Default: none.
-.TP
-.B \fBusername\fP
-.sp
-Optional. User name for authenticating with the SMTP server.
-Default: none.
-.TP
-.B \fBpassword\fP
-.sp
-Optional. Password for authenticating with the SMTP server. If not
-specified, interactive sessions will prompt the user for a
-password; non\-interactive sessions will fail. Default: none.
-.TP
-.B \fBlocal_hostname\fP
-.sp
-Optional. It\(aqs the hostname that the sender can use to identify
-itself to the MTA.
-.UNINDENT
.SS \fBsubpaths\fP
.sp
-Subrepository source URLs can go stale if a remote server changes name
-or becomes temporarily unavailable. This section lets you define
-rewrite rules of the form:
+Defines subrepositories source locations rewriting rules of the form:
.sp
.nf
.ft C
@@ -1313,10 +1182,10 @@ rewrite rules of the form:
.ft P
.fi
.sp
-where \fBpattern\fP is a regular expression matching a subrepository
-source URL and \fBreplacement\fP is the replacement string used to
-rewrite it. Groups can be matched in \fBpattern\fP and referenced in
-\fBreplacements\fP. For instance:
+Where \fBpattern\fP is a regular expression matching the source and
+\fBreplacement\fP is the replacement string used to rewrite it. Groups
+can be matched in \fBpattern\fP and referenced in \fBreplacements\fP. For
+instance:
.sp
.nf
.ft C
@@ -1326,9 +1195,7 @@ http://server/(.*)\-hg/ = http://hg.server/\e1/
.sp
rewrites \fBhttp://server/foo\-hg/\fP into \fBhttp://hg.server/foo/\fP.
.sp
-Relative subrepository paths are first made absolute, and the
-rewrite rules are then applied on the full (absolute) path. The rules
-are applied in definition order.
+All patterns are applied in definition order.
.SS \fBtrusted\fP
.sp
Mercurial will not use the settings in the
@@ -1379,7 +1246,7 @@ Default is False.
Whether to commit modified subrepositories when committing the
parent repository. If False and one subrepository has uncommitted
changes, abort the commit.
-Default is False.
+Default is True.
.TP
.B \fBdebug\fP
.sp
@@ -1438,11 +1305,6 @@ Reduce the amount of output printed. True or False. Default is False.
.sp
remote command to use for clone/push/pull operations. Default is \fBhg\fP.
.TP
-.B \fBreportoldssl\fP
-.sp
-Warn if an SSL certificate is unable to be due to using Python
-2.5 or earlier. True or False. Default is True.
-.TP
.B \fBreport_untrusted\fP
.sp
Warn if a \fB.hg/hgrc\fP file is ignored due to not being owned by a
@@ -1563,6 +1425,14 @@ must have been authenticated, and the authenticated user name must
be present in this list. The contents of the allow_push list are
examined after the deny_push list.
.TP
+.B \fBguessmime\fP
+.sp
+Control MIME types for raw download of file content.
+Set to True to let hgweb guess the content type from the file
+extension. This will serve HTML files as \fBtext/html\fP and might
+allow cross\-site scripting attacks when serving untrusted
+repositories. Default is False.
+.TP
.B \fBallow_read\fP
.sp
If the user has not already been denied repository access due to
@@ -1592,20 +1462,7 @@ Path to file containing a list of PEM encoded certificate
authority certificates. Environment variables and \fB~user\fP
constructs are expanded in the filename. If specified on the
client, then it will verify the identity of remote HTTPS servers
-with these certificates.
-.sp
-This feature is only supported when using Python 2.6 or later. If you wish
-to use it with earlier versions of Python, install the backported
-version of the ssl library that is available from
-\fBhttp://pypi.python.org\fP.
-.sp
-To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
-command line.
-.sp
-You can use OpenSSL\(aqs CA certificate file if your platform has
-one. On most Linux systems this will be
-\fB/etc/ssl/certs/ca\-certificates.crt\fP. Otherwise you will have to
-generate this file manually. The form must be as follows:
+with these certificates. The form must be as follows:
.sp
.nf
.ft C
@@ -1617,27 +1474,22 @@ generate this file manually. The form must be as follows:
\-\-\-\-\-END CERTIFICATE\-\-\-\-\-
.ft P
.fi
-.TP
-.B \fBcache\fP
.sp
-Whether to support caching in hgweb. Defaults to True.
-.TP
-.B \fBcollapse\fP
+This feature is only supported when using Python 2.6 or later. If you wish
+to use it with earlier versions of Python, install the backported
+version of the ssl library that is available from
+\fBhttp://pypi.python.org\fP.
.sp
-With \fBdescend\fP enabled, repositories in subdirectories are shown at
-a single level alongside repositories in the current path. With
-\fBcollapse\fP also enabled, repositories residing at a deeper level than
-the current path are grouped behind navigable directory entries that
-lead to the locations of these repositories. In effect, this setting
-collapses each collection of repositories found within a subdirectory
-into a single entry for that subdirectory. Default is False.
+You can use OpenSSL\(aqs CA certificate file if your platform has one.
+On most Linux systems this will be \fB/etc/ssl/certs/ca\-certificates.crt\fP.
+Otherwise you will have to generate this file manually.
+.sp
+To disable SSL verification temporarily, specify \fB\-\-insecure\fP from
+command line.
.TP
-.B \fBcomparisoncontext\fP
+.B \fBcache\fP
.sp
-Number of lines of context to show in side\-by\-side file comparison. If
-negative or the value \fBfull\fP, whole files are shown. Default is 5.
-This setting can be overridden by a \fBcontext\fP request parameter to the
-\fBcomparison\fP command, taking the same values.
+Whether to support caching in hgweb. Defaults to True.
.TP
.B \fBcontact\fP
.sp
@@ -1688,14 +1540,6 @@ Example: "UTF\-8"
.sp
Where to output the error log. Default is stderr.
.TP
-.B \fBguessmime\fP
-.sp
-Control MIME types for raw download of file content.
-Set to True to let hgweb guess the content type from the file
-extension. This will serve HTML files as \fBtext/html\fP and might
-allow cross\-site scripting attacks when serving untrusted
-repositories. Default is False.
-.TP
.B \fBhidden\fP
.sp
Whether to hide the repository in the hgwebdir index.
@@ -1705,18 +1549,16 @@ Default is False.
.sp
Whether to use IPv6. Default is False.
.TP
-.B \fBlogoimg\fP
-.sp
-File name of the logo image that some templates display on each page.
-The file name is relative to \fBstaticurl\fP. That is, the full path to
-the logo image is "staticurl/logoimg".
-If unset, \fBhglogo.png\fP will be used.
-.TP
.B \fBlogourl\fP
.sp
Base URL to use for logos. If unset, \fBhttp://mercurial.selenic.com/\fP
will be used.
.TP
+.B \fBname\fP
+.sp
+Repository name to use in the web interface. Default is current
+working directory.
+.TP
.B \fBmaxchanges\fP
.sp
Maximum number of changes to list on the changelog. Default is 10.
@@ -1725,16 +1567,6 @@ Maximum number of changes to list on the changelog. Default is 10.
.sp
Maximum number of files to list per changeset. Default is 10.
.TP
-.B \fBmaxshortchanges\fP
-.sp
-Maximum number of changes to list on the shortlog, graph or filelog
-pages. Default is 60.
-.TP
-.B \fBname\fP
-.sp
-Repository name to use in the web interface. Default is current
-working directory.
-.TP
.B \fBport\fP
.sp
Port to listen on. Default is 8000.
@@ -1779,7 +1611,7 @@ Mercurial was written by Matt Mackall <\%mpm@selenic.com\:>.
.SH COPYING
.sp
This manual page is copyright 2005 Bryan O\(aqSullivan.
-Mercurial is copyright 2005\-2012 Matt Mackall.
+Mercurial is copyright 2005\-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
.\" Common link and substitution definitions.