GNU bug report logs - #23436
[PATCH] Use the true name of a file to determine responsible vc.

Previous Next

Full log

View this message in rfc822 format

From: Hong Xu <hong <at> topbug.net>
To: 23436 <at> debbugs.gnu.org
Subject: bug#23436: [PATCH] Use the true name of a file to determine responsible vc.
Date: Wed, 19 Oct 2016 12:19:51 -0700

[Message part 1 (text/plain, inline)]

A better version of the fix is attached.


On 05/03/2016 02:32 PM, Hong Xu wrote:
> In many cases, e.g., a symbolic link to a directory inside a vc tracked
> directory, vc-responsible-backend would fail to know the true backend.
> 
> ---
> 
> There is probably a better fix than this... Feel free to do so.
> 
> ---
>  lisp/vc/vc.el | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
> index 25b41e34e645..1b060b4d1374 100644
> --- a/lisp/vc/vc.el
> +++ b/lisp/vc/vc.el
> @@ -960,14 +960,15 @@ If FILE is already registered, return the
>  backend of FILE.  If FILE is not registered, then the
>  first backend in `vc-handled-backends' that declares itself
>  responsible for FILE is returned."
> -  (or (and (not (file-directory-p file)) (vc-backend file))
> +  (let ((file-path (file-truename file)))
> +    (or (and (not (file-directory-p file-path)) (vc-backend file-path))
>        (catch 'found
> -	;; First try: find a responsible backend.  If this is for registration,
> -	;; it must be a backend under which FILE is not yet registered.
> -	(dolist (backend vc-handled-backends)
> -	  (and (vc-call-backend backend 'responsible-p file)
> -	       (throw 'found backend))))
> -      (error "No VC backend is responsible for %s" file)))
> +        ;; First try: find a responsible backend.  If this is for registration,
> +        ;; it must be a backend under which FILE is not yet registered.
> +        (dolist (backend vc-handled-backends)
> +          (and (vc-call-backend backend 'responsible-p file-path)
> +            (throw 'found backend))))
> +      (error "No VC backend is responsible for %s" file-path))))
>  
>  (defun vc-expand-dirs (file-or-dir-list backend)
>    "Expands directories in a file list specification.
> 

[vc.patch (text/x-patch, attachment)]

[signature.asc (application/pgp-signature, attachment)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.