RE: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

RE: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

[Marshall, Simon]

[-- Attachment #1: Type: text/plain, Size: 753 bytes --]

> I've just installed a patch to deal with this.  It uses the 
> same mechanism that VC already uses to find out if rcsdiff 
> understands the --brief option.  VC will first try to use -L, 
> and then remember whether it worked in the new variable 
> vc-diff-knows-L.
> 
> The patch assumes that a "diff" that does not understand -L 
> returns error code 2 when the option is used.  I have not 
> been able to verify this with Solaris 8 diff, but I'm pretty 
> sure that this is how it's reported.
> 
> If anybody sees a more elegant way to implement this, please 
> don't hesitate to change it.

Hi Andre, I just did a cvs update to try it out.  On C-x v =, I get:

diff: two filename arguments required

I think the attached patch fixes it.  Simon.



[-- Attachment #2: vc.el.diff --]
[-- Type: application/octet-stream, Size: 1955 bytes --]

Index: lisp/vc.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc.el,v
retrieving revision 1.420
diff -c -r1.420 vc.el
*** lisp/vc.el	23 Jun 2006 17:29:19 -0000	1.420
--- lisp/vc.el	26 Jun 2006 09:34:16 -0000
***************
*** 1846,1852 ****
      (if (and file-rev1 file-rev2)
          (let ((status
                 (if (eq vc-diff-knows-L 'no)
!                    (apply 'vc-do-command "*vc-diff*" 1 "diff"
                            (append (vc-switches nil 'diff)
                                    (list (file-relative-name file-rev1)
                                          (file-relative-name file-rev2))))
--- 1846,1852 ----
      (if (and file-rev1 file-rev2)
          (let ((status
                 (if (eq vc-diff-knows-L 'no)
!                    (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
                            (append (vc-switches nil 'diff)
                                    (list (file-relative-name file-rev1)
                                          (file-relative-name file-rev2))))
***************
*** 1864,1870 ****
            (if (eq status 2)
                (if (not vc-diff-knows-L)
                    (setq vc-diff-knows-L 'no
!                         status (apply 'vc-do-command "*vc-diff*" 1 "diff"
                                        (append 
                                         (vc-switches nil 'diff)
                                         (list (file-relative-name file-rev1)
--- 1864,1870 ----
            (if (eq status 2)
                (if (not vc-diff-knows-L)
                    (setq vc-diff-knows-L 'no
!                         status (apply 'vc-do-command "*vc-diff*" 1 "diff" nil
                                        (append 
                                         (vc-switches nil 'diff)
                                         (list (file-relative-name file-rev1)

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

[simon.marshall@misys.com: vc-diff uses unknown -L switch]

[Richard Stallman]

Would someone please DTRT and ack?

------- Start of forwarded message -------
From: "Marshall, Simon" <simon.marshall@misys.com>
To: "'Emacs Pretest Bug (emacs-pretest-bug@gnu.org)'"
	<emacs-pretest-bug@gnu.org>
Date: Fri, 16 Jun 2006 09:35:35 +0100
MIME-Version: 1.0
Content-Type: text/plain
Subject: vc-diff uses unknown -L switch
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=failed 
	version=3.0.4

I forgot to say previously - thanks for the work on 22.1 guys.

Anyway, the bug with emacs from CVS trunk (is this correct for 22.1???)
updated 2006-06-15.

On Solaris 8 with a file under CVS, if I do C-x v = I get:

/usr/bin/diff: illegal option -- L
usage: diff [-bitw] [-c | -e | -f | -h | -n] file1 file2
       diff [-bitw] [-C number] file1 file2
       diff [-bitw] [-D string] file1 file2
       diff [-bitw] [-c | -e | -f | -h | -n] [-l] [-r] [-s] [-S name]
directory1 directory2

It seems vc-diff-internal is using -L flags for diff.  Labels don't seem to
be supported by Solaris 8 diff.


In GNU Emacs 22.0.50.1 (sparc-sun-solaris2.8, Motif Version 2.1.0)  of
2006-06-15 on perth X server distributor `Hummingbird Ltd.', version
11.0.100015 configured using `configure
'--prefix=/rvcarma/marshals/software/slash/usr/local'
'--with-x-toolkit=motif' 'CFLAGS=-g''

Important settings:
  value of $LC_ALL: nil
  value of $LC_COLLATE: en_GB.ISO8859-1
  value of $LC_CTYPE: en_GB.ISO8859-1
  value of $LC_MESSAGES: C
  value of $LC_MONETARY: en_GB.ISO8859-1
  value of $LC_NUMERIC: en_GB.ISO8859-1
  value of $LC_TIME: en_GB.ISO8859-1
  value of $LANG: en_GB.ISO8859-1
  locale-coding-system: iso-8859-1
  default-enable-multibyte-characters: t

Major mode: Emacs-Lisp

Minor modes in effect:
  delete-selection-mode: t
  mouse-sel-mode: t
  msb-mode: t
  partial-completion-mode: t
  show-paren-mode: t
  tooltip-mode: t
  mouse-wheel-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  unify-8859-on-encoding-mode: t
  utf-translate-cjk-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
5 f ~ / s l <tab> u s r <tab> l o c <tab> s h <tab> e m <tab> l i s <tab>
<backspace> <backspace> <backspace> e m <tab> <backspace> <backspace> <tab>
<switch-frame> <drag-n-drop> <switch-frame> 2 1 . 3 / l i s <tab> v c . e l
<tab> <return> <drag-n-drop> <switch-frame> <select-window> <help-echo>
<switch-frame> <switch-frame> <select-window> <switch-frame> <switch-frame>
<switch-frame> <select-window> <menu-bar> <index> "From:
vc-default-diff-tree" 
"vc-diff-internal" <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1>
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1> <mouse-1>
<mouse-1> <mouse-1> <mouse-1> <mouse-1> <switch-frame> <down-mouse-1>
<mouse-movement> <mouse-1> <double-down-mouse-1> <double-mouse-1> <escape> w
<switch-frame> <help-echo> <help-echo> <help-echo> <help-echo> <menu-bar>
<help-menu> <report-emacs-bug>

Recent messages:
Loading vc...done
Running cvs in the background...
Loading log-view...
Loading easy-mmode...done
Loading log-view...done
Running cvs in the background... done
("-c")
Mark saved where search started
Mark set
Loading emacsbug...done


_______________________________________________
emacs-pretest-bug mailing list
emacs-pretest-bug@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-pretest-bug
------- End of forwarded message -------

Re: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

[Andre Spiegel]

> It seems vc-diff-internal is using -L flags for diff.  Labels don't seem to
> be supported by Solaris 8 diff.

Usage of -L was introduced in vc.el in March 2004.  At the time, there
was some discussion about whether that switch was available in enough
versions of diff.  Back then, people seemed to agree it was widespread
enough.  Solaris 8 is a fairly important operating system though, and if
it doesn't support -L natively, I think vc.el needs to be able to deal
with this.

Stefan, can you have a look?

Re: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

[Stefan Monnier]

> Usage of -L was introduced in vc.el in March 2004.  At the time, there
> was some discussion about whether that switch was available in enough
> versions of diff.  Back then, people seemed to agree it was widespread
> enough.  Solaris 8 is a fairly important operating system though, and if
> it doesn't support -L natively, I think vc.el needs to be able to deal
> with this.

> Stefan, can you have a look?

I'm on a trip right now, so if you find the time, please do it.
Otherwise I'll take a look at it when I come back,


        Stefan

Re: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

[Richard Stallman]

    I'm on a trip right now, so if you find the time, please do it.
    Otherwise I'll take a look at it when I come back,

Whoever looks at this, would you please ack this message
when it is done?

Re: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

[Andre Spiegel]

> Whoever looks at this, would you please ack this message
> when it is done?

I've just installed a patch to deal with this.  It uses the same
mechanism that VC already uses to find out if rcsdiff understands the
--brief option.  VC will first try to use -L, and then remember whether
it worked in the new variable vc-diff-knows-L.

The patch assumes that a "diff" that does not understand -L returns
error code 2 when the option is used.  I have not been able to verify
this with Solaris 8 diff, but I'm pretty sure that this is how it's
reported.

If anybody sees a more elegant way to implement this, please don't
hesitate to change it.

Re: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

[Kevin Rodgers]

Andre Spiegel wrote:
> The patch assumes that a "diff" that does not understand -L returns
> error code 2 when the option is used.  I have not been able to verify
> this with Solaris 8 diff, but I'm pretty sure that this is how it's
> reported.

I can verify that `diff -L` on Solaris 8 returns with exit status 2.

-- 
Kevin

Re: [simon.marshall@misys.com: vc-diff uses unknown -L switch]

[Richard Stallman]

Thanks.