# HG changeset patch
# User Pierre-Yves David <pierre-yves.da...@ens-lyon.org>
# Date 1488396124 -3600
# Wed Mar 01 20:22:04 2017 +0100
# Node ID f854d56365922dce4fdf9545a165d85ce331d084
# Parent 0bb3089fe73527c64f1afc40b86ecb8dfe7fd7aa
# Available At https://www.mercurial-scm.org/repo/users/marmoute/mercurial/
# hg pull
https://www.mercurial-scm.org/repo/users/marmoute/mercurial/ -r f854d5636592
# EXP-Topic color
color: update the help table
We also need to reference the new topic in the great old help table.
diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -208,6 +208,7 @@ def internalshelp(ui):
return ''.join(lines)
helptable = sorted([
+ (['color'], _("Colorizing Outputs"), loaddoc('color')),
(["config", "hgrc"], _("Configuration Files"), loaddoc('config')),
(["dates"], _("Date Formats"), loaddoc('dates')),
(["patterns"], _("File Name Patterns"), loaddoc('patterns')),
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -340,6 +340,7 @@ Testing -h/--help:
additional help topics:
+ color Colorizing Outputs
config Configuration Files
dates Date Formats
diffs Diff Formats
@@ -422,6 +423,7 @@ Testing -h/--help:
additional help topics:
+ color Colorizing Outputs
config Configuration Files
dates Date Formats
diffs Diff Formats
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -102,6 +102,7 @@ Short help:
additional help topics:
+ color Colorizing Outputs
config Configuration Files
dates Date Formats
diffs Diff Formats
@@ -178,6 +179,7 @@ Short help:
additional help topics:
+ color Colorizing Outputs
config Configuration Files
dates Date Formats
diffs Diff Formats
@@ -825,6 +827,7 @@ Test that default list of commands omits
additional help topics:
+ color Colorizing Outputs
config Configuration Files
dates Date Formats
diffs Diff Formats
@@ -1859,6 +1862,13 @@ Dish up an empty repo; serve it cold.
<tr><td colspan="2"><h2><a name="topics"
href="#topics">Topics</a></h2></td></tr>
<tr><td>
+ <a href="/help/color">
+ color
+ </a>
+ </td><td>
+ Colorizing Outputs
+ </td></tr>
+ <tr><td>
<a href="/help/config">
config
</a>
diff --git a/tests/test-hgweb-json.t b/tests/test-hgweb-json.t
--- a/tests/test-hgweb-json.t
+++ b/tests/test-hgweb-json.t
@@ -1549,6 +1549,10 @@ help/ shows help topics
],
"topics": [
{
+ "summary": "Colorizing Outputs",
+ "topic": "color"
+ },
+ {
"summary": "Configuration Files",
"topic": "config"
},
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
