Bugfix for vc-rcs.el

Bugfix for vc-rcs.el

[Sascha Wilde]

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

This change by Andre Spiegel:
    * vc-hooks.el (vc-user-login-name): Rewritten to handle access via
    Tramp.

broke vc-rcs, as it used vs-user-login-name without the now required
argument file.

I attached a fix.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: cv-rcs fix --]
[-- Type: text/x-patch, Size: 1382 bytes --]

*** vc-rcs.el	23 Jan 2006 03:00:06 +0100	1.46
--- vc-rcs.el	27 Jan 2006 13:02:46 +0100	
***************
*** 818,824 ****
              'needs-patch))
  	 ;; locked by the calling user
  	 ((and (stringp locking-user)
! 	       (string= locking-user (vc-user-login-name)))
  	  (if (or (eq (vc-checkout-model file) 'locking)
  		  workfile-is-latest
  		  (vc-rcs-latest-on-branch-p file workfile-version))
--- 818,824 ----
              'needs-patch))
  	 ;; locked by the calling user
  	 ((and (stringp locking-user)
! 	       (string= locking-user (vc-user-login-name file)))
  	  (if (or (eq (vc-checkout-model file) 'locking)
  		  workfile-is-latest
  		  (vc-rcs-latest-on-branch-p file workfile-version))
***************
*** 907,913 ****
  	  (vc-file-setprop file 'vc-state
  			   (cond
  			    ((eq locking-user 'none) 'up-to-date)
! 			    ((string= locking-user (vc-user-login-name)) 'edited)
  			    (t locking-user)))
  	  ;; If the file has headers, we don't want to query the
  	  ;; master file, because that would eliminate all the
--- 907,913 ----
  	  (vc-file-setprop file 'vc-state
  			   (cond
  			    ((eq locking-user 'none) 'up-to-date)
! 			    ((string= locking-user (vc-user-login-name file)) 'edited)
  			    (t locking-user)))
  	  ;; If the file has headers, we don't want to query the
  	  ;; master file, because that would eliminate all the

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


cheers
sascha
-- 
Sascha Wilde

Programmer - A red-eyed, mumbling mammal capable of conversing with
             inanimate objects.

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

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

Re: Bugfix for vc-rcs.el

[Andre Spiegel]

On Fri, 2006-01-27 at 13:12 +0100, Sascha Wilde wrote:

> This change by Andre Spiegel:
>     * vc-hooks.el (vc-user-login-name): Rewritten to handle access via
>     Tramp.
> 
> broke vc-rcs, as it used vs-user-login-name without the now required
> argument file.

Ah, sorry, I forgot about that.  It's fixed now.  Thanks for pointing it
out.