Patchwork help: make "mergetool" an alias for "merge-tools"

login
register
mail settings
Submitter Gregory Szorc
Date Jan. 14, 2017, 5:25 a.m.
Message ID <bf7280a23d4a4d5fc7ab.1484371545@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/18216/
State Accepted
Headers show

Comments

Gregory Szorc - Jan. 14, 2017, 5:25 a.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1484371262 28800
#      Fri Jan 13 21:21:02 2017 -0800
# Node ID bf7280a23d4a4d5fc7ab553c75b46ff0e569c8ee
# Parent  8614546154cbffe8df6a56d53e404491fa092636
help: make "mergetool" an alias for "merge-tools"

I've probably typed `hg help mergetool` dozens of times. I'm tired
of it not working.
Augie Fackler - Jan. 14, 2017, 5:31 a.m.
> On Jan 14, 2017, at 12:25 AM, Gregory Szorc <gregory.szorc@gmail.com> wrote:
> 
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc@gmail.com>
> # Date 1484371262 28800
> #      Fri Jan 13 21:21:02 2017 -0800
> # Node ID bf7280a23d4a4d5fc7ab553c75b46ff0e569c8ee
> # Parent  8614546154cbffe8df6a56d53e404491fa092636
> help: make "mergetool" an alias for "merge-tools”

Queued thanks

> 
> I've probably typed `hg help mergetool` dozens of times. I'm tired
> of it not working.
> 
> diff --git a/mercurial/help.py b/mercurial/help.py
> --- a/mercurial/help.py
> +++ b/mercurial/help.py
> @@ -214,7 +214,8 @@ helptable = sorted([
>       _('Specifying Revisions'), loaddoc('revisions')),
>     (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')),
>     (['diffs'], _('Diff Formats'), loaddoc('diffs')),
> -    (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')),
> +    (['merge-tools', 'mergetools', 'mergetool'], _('Merge Tools'),
> +     loaddoc('merge-tools')),
>     (['templating', 'templates', 'template', 'style'], _('Template Usage'),
>      loaddoc('templates')),
>     (['urls'], _('URL Paths'), loaddoc('urls')),
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -214,7 +214,8 @@  helptable = sorted([
       _('Specifying Revisions'), loaddoc('revisions')),
     (['filesets', 'fileset'], _("Specifying File Sets"), loaddoc('filesets')),
     (['diffs'], _('Diff Formats'), loaddoc('diffs')),
-    (['merge-tools', 'mergetools'], _('Merge Tools'), loaddoc('merge-tools')),
+    (['merge-tools', 'mergetools', 'mergetool'], _('Merge Tools'),
+     loaddoc('merge-tools')),
     (['templating', 'templates', 'template', 'style'], _('Template Usage'),
      loaddoc('templates')),
     (['urls'], _('URL Paths'), loaddoc('urls')),