Breakage by commit "779bc886f9 * Improve detection of Git submodules"

Breakage by commit "779bc886f9 * Improve detection of Git submodules"

[Tassilo Horn]

Hi Dmitry,

since the commit in the subject, I get errors like the below when
finding a file in a git repository:

--8<---------------cut here---------------start------------->8---
Debugger entered--Lisp error: (file-missing "Opening input file" "No such file or directory" "/home/horn/Repos/el/emacs/lisp/net/.git")
  insert-file-contents(".git")
  project-try-vc("/home/horn/Repos/el/emacs/lisp/net/")
  run-hook-with-args-until-success(project-try-vc "/home/horn/Repos/el/emacs/lisp/net/")
  project--find-in-directory("/home/horn/Repos/el/emacs/lisp/net/")
  project-current()
  eglot--maybe-activate-editing-mode()
  run-hooks(change-major-mode-after-body-hook after-change-major-mode-hook)
  normal-mode(t)
  after-find-file(nil nil t nil nil)
  revert-buffer--default(t nil)
  revert-buffer(t)
  funcall-interactively(revert-buffer t)
  call-interactively(revert-buffer record nil)
  command-execute(revert-buffer record)
--8<---------------cut here---------------end--------------->8---

Bye,
Tassilo

Re: Breakage by commit "779bc886f9 * Improve detection of Git submodules"

[Dmitry Gutov]

Hi Tassilo,

On 15.05.2020 22:03, Tassilo Horn wrote:
> Hi Dmitry,
> 
> since the commit in the subject, I get errors like the below when
> finding a file in a git repository:

Thanks, should be fixed now.

Re: Breakage by commit "779bc886f9 * Improve detection of Git submodules"

[Tassilo Horn]

Dmitry Gutov <dgutov@yandex.ru> writes:

> On 15.05.2020 22:03, Tassilo Horn wrote:
>> Hi Dmitry,
>> since the commit in the subject, I get errors like the below when
>> finding a file in a git repository:
>
> Thanks, should be fixed now.

Nope, sorry.  With emacs -Q evaling

(progn
  (require 'project)
  (project-try-vc "~/Repos/el/emacs/lisp/net"))

gives

Debugger entered--Lisp error: (file-missing "Opening input file" "No such file or directory" "/home/horn/Repos/el/emacs/lisp/net/.git")
  insert-file-contents("/home/horn/Repos/el/emacs/lisp/net/.git")
  project-try-vc("~/Repos/el/emacs/lisp/net")
  (progn (require 'project) (project-try-vc "~/Repos/el/emacs/lisp/net"))

I've edebugged, and the problem is that

(let ((default-directory "~/Repos/el/emacs/lisp/net"))
  (vc-root-dir)) ;=> nil

That's because `vc-deduce-backend' returns nil.  It only looks at
default-directory when in dired-mode, shell-mode, or compilation-mode...
I wonder why that's restricted and not the fallback case...

Bye,
Tassilo

Re: Breakage by commit "779bc886f9 * Improve detection of Git submodules"

[Dmitry Gutov]

On 15.05.2020 22:45, Tassilo Horn wrote:
> I've edebugged, and the problem is that
> 
> (let ((default-directory "~/Repos/el/emacs/lisp/net"))
>    (vc-root-dir)) ;=> nil
> 
> That's because `vc-deduce-backend' returns nil.  It only looks at
> default-directory when in dired-mode, shell-mode, or compilation-mode...

Oh, okay. Sorry about that.

Does this patch fix the situation?

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index faa60d123f..0ce2786a4d 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -274,8 +274,7 @@ project-try-vc
              ('Git
               ;; Don't stop at submodule boundary.
               (or (vc-file-getprop dir 'project-git-root)
-                 (let* ((default-directory dir)
-                        (root (vc-root-dir))
+                 (let* ((root (vc-call-backend backend 'root dir))
                          (gitfile (expand-file-name ".git" root)))
                     (vc-file-setprop
                      dir 'project-git-root
@@ -287,9 +286,8 @@ project-try-vc
                          (goto-char (point-min))
                          (looking-at "gitdir: [./]+/\.git/modules/"))
                        (let* ((parent (file-name-directory
-                                      (directory-file-name root)))
-                             (default-directory parent))
-                        (vc-root-dir)))
+                                      (directory-file-name root))))
+                        (vc-call-backend backend 'root parent)))
                       (t root)))
                     )))
              ('nil nil)

Re: Breakage by commit "779bc886f9 * Improve detection of Git submodules"

[Tassilo Horn]

Dmitry Gutov <dgutov@yandex.ru> writes:

> On 15.05.2020 22:45, Tassilo Horn wrote:
>> I've edebugged, and the problem is that
>> (let ((default-directory "~/Repos/el/emacs/lisp/net"))
>>    (vc-root-dir)) ;=> nil
>> That's because `vc-deduce-backend' returns nil.  It only looks at
>> default-directory when in dired-mode, shell-mode, or compilation-mode...
>
> Oh, okay. Sorry about that.
>
> Does this patch fix the situation?

Yes, that works.  Thanks!

Bye,
Tassilo