GNU bug report logs - #26345
25.1; vc-annotate in Git is unable to fully navigate the history if the file was moved

Previous Next

Full log

Message #30 received at 26345 <at> debbugs.gnu.org (full text, mbox):

From: Eli Zaretskii <eliz <at> gnu.org>
To: Jakub Ječmínek <kuba <at> kubajecminek.cz>,
 Sean Whitton <spwhitton <at> spwhitton.name>
Cc: kuba <at> kubajecminek.cz, wojciech.siewierski <at> gmail.com, 26345 <at> debbugs.gnu.org,
 dgutov <at> yandex.ru
Subject: Re: bug#26345: [PATCH] Handle renamed files when cycling through
 revisions
Date: Sat, 05 Jul 2025 11:57:33 +0300

> Cc: Jakub Ječmínek <kuba <at> kubajecminek.cz>,
>  26345 <at> debbugs.gnu.org, wojciech.siewierski <at> gmail.com
> Date: Mon, 30 Jun 2025 22:29:43 +0200
> From:  Jakub Ječmínek via "Bug reports for GNU Emacs,
>  the Swiss army knife of text editors" <bug-gnu-emacs <at> gnu.org>
> 
> * lisp/vc/vc-git.el (vc-git-registered,vc-git-annotate-command):
> Update the FILE argument passed to 'vc-git-annotate-command'
> based on whether FILE exists in the current revision. If it
> doesn't, look up its new name. (Bug#26345)
> ---
> What do you think about the patch below?

Sean, any comments?

>  lisp/vc/vc-git.el | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
> index e27798913fe..8f10893d0ba 100644
> --- a/lisp/vc/vc-git.el
> +++ b/lisp/vc/vc-git.el
> @@ -289,12 +289,13 @@ vc-git-update-on-retrieve-tag
>  ;;;###autoload         (load "vc-git" nil t)
>  ;;;###autoload         (vc-git-registered file))))
>  
> -(defun vc-git-registered (file)
> +(defun vc-git-registered (file &optional rev)
>    "Check whether FILE is registered with git."
>    (let ((dir (vc-git-root file)))
>      (when dir
>        (with-temp-buffer
>          (let* (process-file-side-effects
> +               (rev (or rev "HEAD"))
>                 ;; Do not use the `file-name-directory' here: git-ls-files
>                 ;; sometimes fails to return the correct status for relative
>                 ;; path specs.
> @@ -306,7 +307,7 @@ vc-git-registered
>                        ;; If result is empty, use ls-tree to check for deleted
>                        ;; file.
>                        (when (eq (point-min) (point-max))
> -                        (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD"
> +                        (vc-git--out-ok "ls-tree" "--name-only" "-z" rev
>                                          "--" name))
>                        (buffer-string))))
>            (and str
> @@ -1860,7 +1861,12 @@ vc-git-revision-completion-table
>  
>  (defun vc-git-annotate-command (file buf &optional rev)
>    (vc-git--asciify-coding-system)
> -  (let ((name (file-relative-name file)))
> +  ;; If the file does not exist in the tree, it most likely means
> +  ;; that it has been renamed.  Bug#26345
> +  (let* ((file (if (vc-git-registered file rev)
> +                   file
> +                 (cdr (assoc file (vc-git-file-name-changes rev)))))
> +         (name (file-relative-name file)))
>      (apply #'vc-git-command buf 'async nil "blame" "--date=short"
>  	   (append (vc-switches 'git 'annotate)
>  		   (list rev "--" name)))))
> -- 
> 2.49.0
> 
> 
> 
> 
> 

Previous Next

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