Fix vc-svn.el 1.27 when using with GNU Emacs 21.4

Fix vc-svn.el 1.27 when using with GNU Emacs 21.4

[Henning Schmiedehausen]

Please apply the attached patch. Its function is obvious. As
vc-do-command only returns 'nil' or 'error', the status is never 0. As a
result, vc-svn.el has been broken for a while when using with emacs
21.4.

	Best regards
		Henning


-- 
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen          INTERMETA GmbH
hps@intermeta.de        +49 9131 50 654 0   http://www.intermeta.de/

      RedHat Certified Engineer -- Jakarta Turbine Development
   Linux, Java, perl, Solaris -- Consulting, Training, Engineering

Social behaviour: Bavarians can be extremely egalitarian and folksy.
                                    -- http://en.wikipedia.org/wiki/Bavaria
Most Franconians do not like to be called Bavarians.
                                    -- http://en.wikipedia.org/wiki/Franconia

Re: Fix vc-svn.el 1.27 when using with GNU Emacs 21.4

[Henning Schmiedehausen]

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

Grmph. Wrong button. Who designs an user interface where "attach" and
"send" are right next to each other?

	Best regards
		Henning



On Sat, 2006-04-01 at 15:09 +0200, Henning Schmiedehausen wrote:
> Please apply the attached patch. Its function is obvious. As
> vc-do-command only returns 'nil' or 'error', the status is never 0. As a
> result, vc-svn.el has been broken for a while when using with emacs
> 21.4.
> 
> 	Best regards
> 		Henning
> 
> 
-- 
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen          INTERMETA GmbH
hps@intermeta.de        +49 9131 50 654 0   http://www.intermeta.de/

      RedHat Certified Engineer -- Jakarta Turbine Development
   Linux, Java, perl, Solaris -- Consulting, Training, Engineering

Social behaviour: Bavarians can be extremely egalitarian and folksy.
                                    -- http://en.wikipedia.org/wiki/Bavaria
Most Franconians do not like to be called Bavarians.
                                    -- http://en.wikipedia.org/wiki/Franconia

[-- Attachment #2: emacs-svn-vc-svn-registered.patch --]
[-- Type: text/x-patch, Size: 465 bytes --]

--- emacs-svn-1.27/vc-svn.el~	2006-04-01 15:05:21.000000000 +0200
+++ emacs-svn-1.27/vc-svn.el	2006-04-01 15:05:51.000000000 +0200
@@ -124,7 +124,7 @@
                ;; is only reported via the exit status which is turned into
                ;; an `error' by vc-do-command.
                (error nil))))
-        (when (eq 0 status)
+        (when (eq nil status)
           (vc-svn-parse-status t)
           (eq 'SVN (vc-file-getprop file 'vc-backend)))))))
 

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

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

Re: Fix vc-svn.el 1.27 when using with GNU Emacs 21.4

[Bill Wohler]

Henning Schmiedehausen <hps@intermeta.de> writes:

> Grmph. Wrong button. Who designs an user interface where "attach" and
> "send" are right next to each other?

Certainly not Evolution, which you're using ;-).

Neither does Gnus, nor MH-E. At least in CVS.

I recently moved Attach to the right of Save and Delete (in MH-E). OK,
so you could hit Delete when want Attach, but at least there is a
confirmation.

-- 
Bill Wohler <wohler@newt.com>  http://www.newt.com/wohler/  GnuPG ID:610BD9AD
Maintainer of comp.mail.mh FAQ and MH-E. Vote Libertarian!
If you're passed on the right, you're in the wrong lane.

Re: Fix vc-svn.el 1.27 when using with GNU Emacs 21.4

[Stefan Monnier]

>> Please apply the attached patch.  Its function is obvious.
>> As vc-do-command only returns 'nil' or 'error', the status is never 0.
>> As a result, vc-svn.el has been broken for a while when using with Emacs
>> 21.4.

Your change breaks the code under Emacs-CVS where vc-do-command does return
the execution status.  Emacs-CVS's vc-svn.el is meant to be used with
Emacs-CVS and I'm even surprised it works with Emacs-21.4 because it relies
on several changes in vc.el that occurred since Emacs-21.


        Stefan

Re: Fix vc-svn.el 1.27 when using with GNU Emacs 21.4

[Andre Spiegel]

On Sat, 2006-04-01 at 15:09 +0200, Henning Schmiedehausen wrote:

> Please apply the attached patch. Its function is obvious. As
> vc-do-command only returns 'nil' or 'error', the status is never 0. As a
> result, vc-svn.el has been broken for a while when using with emacs
> 21.4.

No, vc-do-command is supposed to return the execution status, and does
indeed do it, even in Emacs 21.4.  I think you may be having another
problem, and because vc-svn.el 1.27 ignores all errors in the call to
vc-svn-command, you may not be able to see what's actually happening.

In vc-svn-registered, where it says:

      (let ((status
             (condition-case nil
                 ;; Ignore all errors.
                 (vc-svn-command t t file "status" "-v")
               ;; Some problem happened.  E.g. We can't find an `svn'
               ;; executable.  We used to only catch `file-error' but when
               ;; the process is run on a remote host via Tramp, the error
               ;; is only reported via the exit status which is turned into
               ;; an `error' by vc-do-command.
               (error nil))))
        (when (eq 0 status)
          (vc-svn-parse-status t)
          (eq 'SVN (vc-file-getprop file 'vc-backend)))))))

try replacing (error nil) with (file-error nil) and see what kind of
error message you get.