Mercurial > hg-stable
changeset 23151:733d980b9c59
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.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 02 Nov 2014 15:27:15 -0500 |
| parents | aff73c777b0b |
| children | b8f6d840d3ec |
| files | hgext/extdiff.py tests/test-extension.t |
| diffstat | 2 files changed, 0 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/extdiff.py Fri Oct 31 21:34:55 2014 -0400 +++ b/hgext/extdiff.py Sun Nov 02 15:27:15 2014 -0500 @@ -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
--- a/tests/test-extension.t Fri Oct 31 21:34:55 2014 -0400 +++ b/tests/test-extension.t Sun Nov 02 15:27:15 2014 -0500 @@ -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