[PATCH 3 of 4] help: improve config file location description
Mads Kiilerich
mads at kiilerich.com
Wed Sep 24 20:33:04 CDT 2014
# HG changeset patch
# User Mads Kiilerich <madski at unity3d.com>
# Date 1411608512 -7200
# Thu Sep 25 03:28:32 2014 +0200
# Node ID a2f00946b45a9dc002578c1782ab36b7cc659d14
# Parent dd258c1ad068e812fd639f5a59a24fdc1b939d60
help: improve config file location description
Try to make it look more simple.
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4660,9 +4660,8 @@ def paths(ui, repo, search=None):
Option -q/--quiet suppresses all output when searching for NAME
and shows only the path names when listing all definitions.
- Path names are defined in the [paths] section of your
- configuration file and in ``/etc/mercurial/hgrc``. If run inside a
- repository, ``.hg/hgrc`` is used, too.
+ Path names are defined in in your global, personal and per repo
+ configuration in the [paths] section.
The path names ``default`` and ``default-push`` have a special
meaning. When performing a push or pull operation, they are used
diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -34,10 +34,12 @@ the current repo, user, system and Mercu
| (All) ``<repo>/.hg/hgrc``
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
- Unix, most of this file will be ignored if it doesn't
+ particular repository.
+
+ This file is not version-controlled, and will not get transferred
+ during a "clone" operation.
+
+ On Unix, most of this file will be ignored if it doesn't
belong to a trusted user or to a trusted group. See the documentation
for the ``[trusted]`` section below for more details.
@@ -47,47 +49,41 @@ the current repo, user, system and Mercu
| (Windows) ``%HOME%\.hgrc``
| (Windows) ``%HOME%\Mercurial.ini``
- Per-user configuration file(s), for the user running Mercurial. On
- Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these
- files apply to all Mercurial commands executed by this user in any
- directory. Options in these files override per-system and per-installation
- options.
+ Per-user configuration file(s), for the user running Mercurial. Options in
+ these files apply to all Mercurial commands executed by this user in any
+ directory.
| (Unix) ``/etc/mercurial/hgrc``
| (Unix) ``/etc/mercurial/hgrc.d/*.rc``
-
- Per-system configuration files, for the system on which Mercurial
- is running. Options in these files apply to all Mercurial commands
- executed by any user in any directory. Options in these files
- override per-installation options.
-
| (Unix) ``<install-root>/etc/mercurial/hgrc``
| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``
- Per-installation configuration files, searched for in the
- directory where Mercurial is installed. ``<install-root>`` is the
- parent directory of the **hg** executable (or symlink) being run. For
- example, if installed in ``/shared/tools/bin/hg``, Mercurial will look
- in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply
- to all Mercurial commands executed by any user in any directory.
+ Per-installation/system configuration files for the system on
+ which Mercurial is running. Options in these files apply to all
+ Mercurial commands executed by any user in any directory.
+
+ ``<install-root>`` is the parent directory of the **hg** executable (or
+ symlink) being run. For example, if installed in ``/shared/tools/bin/hg``,
+ Mercurial will look in ``/shared/tools/etc/mercurial/hgrc``.
| (Windows) ``<install-dir>\Mercurial.ini`` **or**
| (Windows) ``<install-dir>\hgrc.d\*.rc`` **or**
-| (Windows) ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial``
+| (Windows) ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` **or**
+| (Windows) ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
Per-installation/system configuration files, for the system on
which Mercurial is running. Options in these files apply to all
- Mercurial commands executed by any user in any directory. Registry
- keys contain PATH-like strings, every part of which must reference
+ Mercurial commands executed by any user in any directory.
+
+ ``<install-dir>`` is the directory of the **hg** executable being run.
+ For example, if installed in ``c:\Mercurial\hg.exe``,
+ Mercurial will look in ``c:\Mercurial\Mercurial.ini``.
+
+ Registry keys contain PATH-like strings, every part of which must reference
a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
- be read. Mercurial checks each of these locations in the specified
+ be read. Mercurial checks each of these locations in the specified
order until one or more configuration files are detected.
-.. note::
-
- The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
- is used when running 32-bit Python on 64-bit Windows.
-
Syntax
======
More information about the Mercurial-devel
mailing list