diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs --- a/contrib/wix/help.wxs +++ b/contrib/wix/help.wxs @@ -19,6 +19,7 @@ + diff --git a/mercurial/help.py b/mercurial/help.py --- a/mercurial/help.py +++ b/mercurial/help.py @@ -232,6 +232,7 @@ helptable = sorted([ (['bundlespec'], _("Bundle File Formats"), loaddoc('bundlespec')), (['color'], _("Colorizing Outputs"), loaddoc('color')), (["config", "hgrc"], _("Configuration Files"), loaddoc('config')), + (['deprecated'], _("Deprecated Features"), loaddoc('deprecated')), (["dates"], _("Date Formats"), loaddoc('dates')), (["flags"], _("Command-line flags"), loaddoc('flags')), (["patterns"], _("File Name Patterns"), loaddoc('patterns')), diff --git a/mercurial/help/deprecated.txt b/mercurial/help/deprecated.txt new file mode 100644 --- /dev/null +++ b/mercurial/help/deprecated.txt @@ -0,0 +1,30 @@ +Mercurial evolves over time, some features, options, commands may be replaced by +better and more secure alternatives. This topic will help you migrating your +existing usage and/or configuration to newer features. + +Commands +======== + +The following commands are still available but their use are not recommended: + +``locate`` + +This command has been replaced by `hg files`. + +``parents`` + +This command can be replaced by `hg summary` or `hg log` with appropriate +revsets. See `hg help revsets` for more information. + +``tip`` + +The recommended alternative is `hg heads`. + +Options +======= + +``web.allowpull`` + Renamed to `allow-pull`. + +``web.allow_push`` + Renamed to `allow-push`. diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t --- a/tests/test-globalopts.t +++ b/tests/test-globalopts.t @@ -353,6 +353,7 @@ Testing -h/--help: color Colorizing Outputs config Configuration Files dates Date Formats + deprecated Deprecated Features diffs Diff Formats environment Environment Variables extensions Using Additional Features @@ -436,6 +437,7 @@ Testing -h/--help: color Colorizing Outputs config Configuration Files dates Date Formats + deprecated Deprecated Features diffs Diff Formats environment Environment Variables extensions Using Additional Features diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -110,6 +110,7 @@ the extension is unknown. color Colorizing Outputs config Configuration Files dates Date Formats + deprecated Deprecated Features diffs Diff Formats environment Environment Variables extensions Using Additional Features @@ -189,6 +190,7 @@ the extension is unknown. color Colorizing Outputs config Configuration Files dates Date Formats + deprecated Deprecated Features diffs Diff Formats environment Environment Variables extensions Using Additional Features @@ -889,6 +891,7 @@ Test that default list of commands omits color Colorizing Outputs config Configuration Files dates Date Formats + deprecated Deprecated Features diffs Diff Formats environment Environment Variables extensions Using Additional Features @@ -2032,6 +2035,13 @@ Dish up an empty repo; serve it cold. Date Formats + + deprecated + + + Deprecated Features + + diffs 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 @@ -1914,6 +1914,10 @@ help/ shows help topics "topic": "dates" }, { + "summary": "Deprecated Features", + "topic": "deprecated" + }, + { "summary": "Diff Formats", "topic": "diffs" },