| Submitter | Matt Harbison |
|---|---|
| Date | Nov. 2, 2014, 8:58 p.m. |
| Message ID | <cc9048af72fa1ce250a7.1414961903@Envy> |
| Download | mbox | patch |
| Permalink | /patch/6535/ |
| State | Accepted |
| Headers | show |
Comments
On Sun, 2014-11-02 at 15:58 -0500, Matt Harbison wrote: > # HG changeset patch > # User Matt Harbison <matt_harbison@yahoo.com> > # Date 1414960035 18000 > # Sun Nov 02 15:27:15 2014 -0500 > # Branch stable > # Node ID cc9048af72fa1ce250a76d60c1081d5b61962809 > # Parent c83902f33e07c7546fd2c0bf0184456265f08043 > extdiff: drop the command alias without options example in the help text These are queued for default, thanks.
Patch
diff --git a/hgext/extdiff.py b/hgext/extdiff.py --- a/hgext/extdiff.py +++ b/hgext/extdiff.py @@ -23,9 +23,6 @@ #cmd.cdiff = gdiff #opts.cdiff = -Nprc5 - # add new command called vdiff, runs kdiff3 - vdiff = kdiff3 - # add new command called meld, runs meld (no need to name twice). If # the meld executable is not available, the meld tool in [merge-tools] # will be used, if available diff --git a/tests/test-extension.t b/tests/test-extension.t --- a/tests/test-extension.t +++ b/tests/test-extension.t @@ -424,9 +424,6 @@ #cmd.cdiff = gdiff #opts.cdiff = -Nprc5 - # add new command called vdiff, runs kdiff3 - vdiff = kdiff3 - # add new command called meld, runs meld (no need to name twice). If # the meld executable is not available, the meld tool in [merge-tools] # will be used, if available
# HG changeset patch # User Matt Harbison <matt_harbison@yahoo.com> # Date 1414960035 18000 # Sun Nov 02 15:27:15 2014 -0500 # Branch stable # Node ID cc9048af72fa1ce250a76d60c1081d5b61962809 # Parent c83902f33e07c7546fd2c0bf0184456265f08043 extdiff: drop the command alias without options example in the help text In the dropped example, the extension would look for 'vdiff.diffargs' in the configuration, and not finding it, would run kdiff3 without the configured options. That's not obvious to a new user who sees a kdiff3 configuration in the prepackaged mergetools.rc file, and sees that kdiff3 still runs. While it is conceivable that the user wants a kdiff3 command that runs without the preconfigured options, it is more likely what they want is this, which uses the canned options: [alias] vdiff = kdiff3 [extdiff] kdiff3 = We could mention alias here, but that seems like it belongs elswhere.