RE: GNU diff completion problem

RE: GNU diff completion problem

[Sven Wischnowsky]

Andrej Borsenkow wrote:

> ...
> 
> > } I have system default diff and GNU diff as gdiff. Current state does not
> > } allow me to complete GNU diff at all
> >
> > You want
> >
> >     compdef _diff gdiff
> >     zstyle ':completion:*:*:gdiff:*:version' command gdiff -v
> >
> 
> Nope. I do want
> 
> compdef _diff diff gdiff
> 
> without bothering, if GNU diff is installed as main or additional program. The above will
> cover 99.9% of installations.
> 
> I agree with the point, that _diff_options can be called in context without actual
> command. But it simply means, that _diff_options should not test diff version itself, but
> just get a "diff kind" parameter. Actual testing is to be done by _diff.

No it isn't. Or else we would have to do it in every function that
calls _diff_options.


How about this patch? It makes _diff_is_gnu an assoc of $words[1] and
it makes $words[1] be used as the command if it matches *diff. That
last part -- or at least the pattern -- may have to be changed: are
there other commands ending in `diff' that are not real diffs and that 
may be in $words[1] when _diff_options is used?

Bye
 Sven

diff -ru ../z.old/Completion/User/_diff_options Completion/User/_diff_options
--- ../z.old/Completion/User/_diff_options	Thu Mar  9 15:47:15 2000
+++ Completion/User/_diff_options	Fri Mar 10 09:53:31 2000
@@ -1,14 +1,24 @@
 #autoload
 
-local of ofwuc ouc oss ofwy ofwg ofwl
+local of ofwuc ouc oss ofwy ofwg ofwl cmd
 
-(( $+_diff_is_gnu )) || {
-	_diff_is_gnu=0;
-        [[ $(_call version diff -v </dev/null 2>/dev/null) == *GNU* ]] && _diff_is_gnu=1
-}
+(( $+_diff_is_gnu )) || typeset -gA _diff_is_gnu
 
-if (( _diff_is_gnu ))
-then
+if (( ! $+_diff_is_gnu[$words[1]] )); then
+  if [[ "$words[1]" = *diff ]]; then
+    cmd="$words[1]"
+  else
+    cmd=diff
+  fi
+
+  if [[ $(_call version $cmd -v </dev/null 2>/dev/null) = *GNU* ]]; then
+    _diff_is_gnu[$words[1]]=yes
+  else
+    _diff_is_gnu[$words[1]]=
+  fi
+fi
+
+if [[ -n "$_diff_is_gnu[$words[1]]" ]]; then
   # output formats 
   of="-y --side-by-side -n --rcs -e -f --ed -q --brief -c -C --context -u -U \
   --unified --old-group-format --new-group-format --changed-group-format \

--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

Re: GNU diff completion problem

[Bart Schaefer]

On Mar 10, 10:01am, Sven Wischnowsky wrote:
} Subject: RE: GNU diff completion problem
}
} How about this patch? It makes _diff_is_gnu an assoc of $words[1] and
} it makes $words[1] be used as the command if it matches *diff. That
} last part -- or at least the pattern -- may have to be changed: are
} there other commands ending in `diff' that are not real diffs and that 
} may be in $words[1] when _diff_options is used?

There's rcsdiff, of course, and also mgdiff and zdiff.  All of those are
"diff wrappers" that take the args to pass along to the real "diff".

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Re: GNU diff completion problem

[Alexandre Duret-Lutz]

>>> "Sven" == Sven Wischnowsky <wischnow@informatik.hu-berlin.de> writes:

[...]

 Sven> it makes $words[1] be used as the command if it matches *diff. That
 Sven> last part -- or at least the pattern -- may have to be changed

[...]

Isn't this choice better done by the caller of _diff_options?  
I mean, _diff could say to _diff_options to use "$words[1]", 
_prcs could tell it to use ${PRCS_DIFF_COMMAND:-diff}, and 
so on...

This patch passes the command name as the first argument to
_diff_options (or do you prefer options?), and rewrite 
_diff_is_gnu as _is_gnu like Bart did in 10035.

Index: Completion/User/_prcs
--- Completion/User/_prcs Mon, 28 Feb 2000 11:29:42 +0100 Alexandre
+++ Completion/User/_prcs Fri, 10 Mar 2000 13:25:35 +0100 Alexandre
@@ -136,7 +136,7 @@
       '(--new)-N[compare new files against empty files]' \
       "(-P)--exclude-project-file[don't diff the project file]" \
       "(--exclude-project-file)-P[don't diff the project file]" \
-      '--[introduce diff options]:*::diff options: _diff_options' \
+      '--[introduce diff options]:*::diff options: _diff_options ${PRCS_DIFF_COMMAND:-diff}' \
       ':project name:_prcs_projects' \
       '*:file or directory:_files'
     ;;
Index: Completion/User/_diff
--- Completion/User/_diff Wed, 02 Feb 2000 23:45:59 +0100 Alexandre
+++ Completion/User/_diff Fri, 10 Mar 2000 13:25:35 +0100 Alexandre
@@ -1,3 +1,3 @@
 #compdef diff
 
-_diff_options ':original file:_files' ':new file:_files'
+_diff_options "$words[1]" ':original file:_files' ':new file:_files'
Index: Completion/User/_diff_options
--- Completion/User/_diff_options Fri, 10 Mar 2000 13:24:57 +0100 Alexandre
+++ Completion/User/_diff_options Fri, 10 Mar 2000 13:29:00 +0100 Alexandre
@@ -2,23 +2,20 @@
 
 local of ofwuc ouc oss ofwy ofwg ofwl cmd
 
-(( $+_diff_is_gnu )) || typeset -gA _diff_is_gnu
+(( $+_is_gnu )) || typeset -gA _is_gnu
 
-if (( ! $+_diff_is_gnu[$words[1]] )); then
-  if [[ "$words[1]" = *diff ]]; then
-    cmd="$words[1]"
-  else
-    cmd=diff
-  fi
+cmd="$1"
+shift
 
+if (( ! $+_is_gnu[$cmd] )); then
   if [[ $(_call version $cmd -v </dev/null 2>/dev/null) = *GNU* ]]; then
-    _diff_is_gnu[$words[1]]=yes
+    _is_gnu[$cmd]=yes
   else
-    _diff_is_gnu[$words[1]]=
+    _is_gnu[$cmd]=
   fi
 fi
 
-if [[ -n "$_diff_is_gnu[$words[1]]" ]]; then
+if [[ -n "$_is_gnu[$cmd]" ]]; then
   # output formats 
   of="-y --side-by-side -n --rcs -e -f --ed -q --brief -c -C --context -u -U \
   --unified --old-group-format --new-group-format --changed-group-format \

-- 
Alexandre Duret-Lutz

GNU diff completion problem

[Andrej Borsenkow]

I'm sorry, but I missed this discussion.

Why _diff_options tests diff and not real command ($word[1])? I have system default diff
and GNU diff as gdiff. Current state does not allow me to complete GNU diff at all, and I
do not want change names for many reasons. I believe, this is often the case.

-andrej

Have a nice DOS!
B >>

Re: GNU diff completion problem

[Alexandre Duret-Lutz]

>>> "Andrej" == Andrej Borsenkow <Andrej.Borsenkow@mow.siemens.ru> writes:

 Andrej> I'm sorry, but I missed this discussion.
 Andrej> Why _diff_options tests diff and not real command ($word[1])? 

Because `_diff_options' can be called from places (`_prcs') where 
`$word[1]' is not the real command, not only called from `_diff'

 Andrej> I have system default diff and GNU diff as gdiff. Current state
 Andrej> does not allow me to complete GNU diff at all, and I do not want
 Andrej> change names for many reasons. I believe, this is often the case.

Perhaps a solution would be to pass the real command as the first
argument to `diff_options' and store the `_is_gnu_diff' flag in an
associative array as Sven suggested.

[...]

-- 
Alexandre Duret-Lutz

Re: GNU diff completion problem

[Bart Schaefer]

On Mar 9,  7:45pm, Andrej Borsenkow wrote:
} Subject: GNU diff completion problem
}
} I'm sorry, but I missed this discussion.
} 
} Why _diff_options tests diff and not real command ($word[1])?

It's in case the real command is an alias or function that has unknown
side-effects.

} I have system default diff and GNU diff as gdiff. Current state does not
} allow me to complete GNU diff at all

You want

    compdef _diff gdiff
    zstyle ':completion:*:*:gdiff:*:version' command gdiff -v

There's still a bug in that the next time you use plain `diff' the saved
value of _diff_is_gnu will cause GNU diff options to be completed.  The
value of "_is_gnu" should probably be saved on a per-command basis.

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

RE: GNU diff completion problem

[Andrej Borsenkow]

>
> On Mar 9,  7:45pm, Andrej Borsenkow wrote:
> } Subject: GNU diff completion problem
> }
> } I'm sorry, but I missed this discussion.
> }
> } Why _diff_options tests diff and not real command ($word[1])?
>
> It's in case the real command is an alias or function that has unknown
> side-effects.
>

But this applies just as well to any other possible command that has GNU counterpart and
needs version check. What is so different with diff?

> } I have system default diff and GNU diff as gdiff. Current state does not
> } allow me to complete GNU diff at all
>
> You want
>
>     compdef _diff gdiff
>     zstyle ':completion:*:*:gdiff:*:version' command gdiff -v
>

Nope. I do want

compdef _diff diff gdiff

without bothering, if GNU diff is installed as main or additional program. The above will
cover 99.9% of installations.

I agree with the point, that _diff_options can be called in context without actual
command. But it simply means, that _diff_options should not test diff version itself, but
just get a "diff kind" parameter. Actual testing is to be done by _diff.

-andrej