From: Dmitry Gutov <dgutov@yandex.ru>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Michael Welsh Duggan <mwd@md5i.com>,
Gary Oberbrunner <garyo@oberbrunner.com>,
emacs-devel@gnu.org
Subject: Re: project.el: git submodules?
Date: Thu, 14 May 2020 22:29:23 +0300 [thread overview]
Message-ID: <cba82306-910e-383e-22de-8a59a9f2088f@yandex.ru> (raw)
In-Reply-To: <jwvd076o0yw.fsf-monnier+emacs@gnu.org>
On 14.05.2020 20:57, Stefan Monnier wrote:
>>>> I even have a patch, but here's another thought: wouldn't this mistakenly
>>>> punish people who keep their $HOME as a Git repository to sync
>>>> between machines?
>>> Depends if the Git worktrees within their $HOME use the same repository
>>> as the one used for $HOME.
>> Not 'git worktrees' (to be clear), just random other work directories, for
>> work/hobby/etc projects.
>
> Yes, I make "work trees" in a generic sense not just in the `git worktree` sense.
>
>> Yes, a user option (inrended for dir-locals) is likely in order, but users
>> such as described above would have to set it in _all_ of their
>> work directories.
>
> Not if the repository they use for $HOME is different than the one they
> use for ~/work, ~/my/hobby/, ...
Then they'll only have to set it in ~/.dir-locals.el? Is that what you mean?
Here's the patch I made according to your description:
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index ac56537b97..bf737e821a 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -266,11 +266,18 @@ project-try-vc
(let* ((backend (ignore-errors (vc-responsible-backend dir)))
(root
(pcase backend
- ('Git
+ (`(or ,'Git ,'Hg)
;; Don't stop at submodule boundary.
- (or (vc-file-getprop dir 'project-git-root)
- (vc-file-setprop dir 'project-git-root
- (vc-find-root dir ".git/"))))
+ (or (vc-file-getprop dir 'project-vc-root)
+ (let* ((default-directory dir)
+ (root (vc-root-dir))
+ (parent (file-name-directory
+ (directory-file-name root))))
+ (vc-file-setprop dir 'project-vc-root
+ (or
+ (let ((default-directory parent))
+ (vc-root-dir))
+ root)))))
('nil nil)
(_ (ignore-errors (vc-call-backend backend 'root dir))))))
(and root (cons 'vc root))))
next prev parent reply other threads:[~2020-05-14 19:29 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 15:31 project.el: git submodules? Gary Oberbrunner
2020-05-12 15:53 ` Dmitry Gutov
2020-05-12 18:05 ` Michael Welsh Duggan
2020-05-12 18:27 ` Dmitry Gutov
2020-05-12 19:36 ` Stefan Monnier
2020-05-12 19:39 ` Dmitry Gutov
2020-05-12 20:45 ` Michael Welsh Duggan
2020-05-12 20:53 ` Dmitry Gutov
2020-05-12 21:04 ` Stefan Monnier
2020-05-12 21:06 ` Dmitry Gutov
2020-05-12 21:09 ` Stefan Monnier
2020-05-14 0:32 ` Dmitry Gutov
2020-05-14 2:55 ` Stefan Monnier
2020-05-14 15:04 ` Dmitry Gutov
2020-05-14 17:57 ` Stefan Monnier
2020-05-14 19:29 ` Dmitry Gutov [this message]
2020-05-14 20:01 ` Stefan Monnier
2020-05-14 20:13 ` Dmitry Gutov
2020-05-14 21:17 ` Dmitry Gutov
2020-05-14 21:38 ` Michael Welsh Duggan
2020-05-15 1:21 ` Dmitry Gutov
2020-05-15 5:11 ` Dmitry Gutov
2020-05-15 7:40 ` Kévin Le Gouguec
2020-05-15 19:17 ` Dmitry Gutov
2020-05-12 20:53 ` Michael Welsh Duggan
2020-05-12 20:51 ` Michael Welsh Duggan
2020-05-12 20:58 ` John Yates
2020-05-13 7:19 ` Andreas Schwab
2020-05-12 18:33 ` Gary Oberbrunner
2020-05-12 19:28 ` Dmitry Gutov
2020-05-12 19:34 ` Gary Oberbrunner
2020-05-12 19:41 ` Dmitry Gutov
2020-05-12 19:44 ` Doug Davis
2020-05-12 19:50 ` Gary Oberbrunner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cba82306-910e-383e-22de-8a59a9f2088f@yandex.ru \
--to=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=garyo@oberbrunner.com \
--cc=monnier@iro.umontreal.ca \
--cc=mwd@md5i.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.