Patchwork [2,of,4] help: drop mentioning special Plan 9 config file location

login
register
mail settings
Submitter Mads Kiilerich
Date Sept. 25, 2014, 1:33 a.m.
Message ID <dd258c1ad068e812fd63.1411608783@localhost.localdomain>
Download mbox | patch
Permalink /patch/5968/
State Changes Requested
Headers show

Comments

Mads Kiilerich - Sept. 25, 2014, 1:33 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1411608509 -7200
#      Thu Sep 25 03:28:29 2014 +0200
# Node ID dd258c1ad068e812fd639f5a59a24fdc1b939d60
# Parent  e04d746df4b9a7c5ef32b0bf70284e3dd8402791
help: drop mentioning special Plan 9 config file location

We are proud to support Plan 9, but the usage is so low that we can't afford to
clobber the documentation with a detailed description of its file system
layout. It is already way too complex. hg showconfig --default will still show
the exact paths.
Pierre-Yves David - Sept. 29, 2014, 10:30 p.m.
On 09/24/2014 06:33 PM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1411608509 -7200
> #      Thu Sep 25 03:28:29 2014 +0200
> # Node ID dd258c1ad068e812fd639f5a59a24fdc1b939d60
> # Parent  e04d746df4b9a7c5ef32b0bf70284e3dd8402791
> help: drop mentioning special Plan 9 config file location

Matt said: No. He agrees that the current help is too verbose but the 
reference to plan9 should not be plain dropped but moved to a verbose 
section or something. Further digging on this idea show that we should 
issue plateform specific help for this section. This could be done by 
using os.plateform with the `keep` argument of the help function 
(initialised in `mercurial.commands.help`.
Mads Kiilerich - Sept. 29, 2014, 11:26 p.m.
On 09/30/2014 12:30 AM, Pierre-Yves David wrote:
>
>
> On 09/24/2014 06:33 PM, Mads Kiilerich wrote:
>> # HG changeset patch
>> # User Mads Kiilerich <madski@unity3d.com>
>> # Date 1411608509 -7200
>> #      Thu Sep 25 03:28:29 2014 +0200
>> # Node ID dd258c1ad068e812fd639f5a59a24fdc1b939d60
>> # Parent  e04d746df4b9a7c5ef32b0bf70284e3dd8402791
>> help: drop mentioning special Plan 9 config file location
>
> Matt said: No. He agrees that the current help is too verbose but the 
> reference to plan9 should not be plain dropped but moved to a verbose 
> section or something. Further digging on this idea show that we should 
> issue plateform specific help for this section. This could be done by 
> using os.plateform with the `keep` argument of the help function 
> (initialised in `mercurial.commands.help`.

Meh. That's a bigger step that I won't take. I think it could be done 
later ... but I don't think I agree with it. I will drop these changes. 
Others can pick them up if they like.

Thanks for discussing and pushing the other changes ;-)

/Mads

Patch

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -28,17 +28,19 @@  alphabetical order, later ones overridin
 paths are given below, settings from earlier paths override later
 ones.
 
+Use ``hg showconfig --debug`` to see which config files actually are used for
+the current repo, user, system and Mercurial installation and version.
+
 | (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
-    Plan 9 and Unix, most of this file will be ignored if it doesn't
+    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.
 
-| (Plan 9) ``$home/lib/hgrc``
 | (Unix) ``$HOME/.hgrc``
 | (Windows) ``%USERPROFILE%\.hgrc``
 | (Windows) ``%USERPROFILE%\Mercurial.ini``
@@ -51,8 +53,6 @@  ones.
     directory. Options in these files override per-system and per-installation
     options.
 
-| (Plan 9) ``/lib/mercurial/hgrc``
-| (Plan 9) ``/lib/mercurial/hgrc.d/*.rc``
 | (Unix) ``/etc/mercurial/hgrc``
 | (Unix) ``/etc/mercurial/hgrc.d/*.rc``
 
@@ -61,8 +61,6 @@  ones.
     executed by any user in any directory. Options in these files
     override per-installation options.
 
-| (Plan 9) ``<install-root>/lib/mercurial/hgrc``
-| (Plan 9) ``<install-root>/lib/mercurial/hgrc.d/*.rc``
 | (Unix) ``<install-root>/etc/mercurial/hgrc``
 | (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``