* bug#21930: emacs-repository-get-version fails on linked worktrees
@ 2015-11-16 3:46 Juanma Barranquero
2015-11-16 23:01 ` Stephen Leake
0 siblings, 1 reply; 6+ messages in thread
From: Juanma Barranquero @ 2015-11-16 3:46 UTC (permalink / raw)
To: 21930
[-- Attachment #1: Type: text/plain, Size: 3608 bytes --]
Package: emacs
Version: 25.0.50
Severity: minor
When run inside a linked worktree (created with "git worktree add ..."),
emacs-repository-get-version needs to ask the VCS to find the repository
version, which doesn't work during dumping.
I'd like to apply this patch to the release branch.
diff --git i/lisp/version.el w/lisp/version.el
index 43103fd..4207cb4 100644
--- i/lisp/version.el
+++ w/lisp/version.el
@@ -114,15 +114,15 @@ emacs-repository-version-git
(match-string 0)))))
-(defun emacs-repository--version-git-1 (file)
+(defun emacs-repository--version-git-1 (file dir)
"Internal subroutine of `emacs-repository-get-version'."
(when (file-readable-p file)
- (erase-buffer)
- (insert-file-contents file)
- (cond ((looking-at "[0-9a-fA-F]\\{40\\}")
- (match-string 0))
- ((looking-at "ref: \\(.*\\)")
- (emacs-repository--version-git-1
- (expand-file-name (match-string 1)
- (file-name-directory file)))))))
+ (with-temp-buffer
+ (insert-file-contents file)
+ (cond ((looking-at "[0-9a-fA-F]\\{40\\}")
+ (match-string 0))
+ ((looking-at "ref: \\(.*\\)")
+ (emacs-repository--version-git-1
+ (expand-file-name (match-string 1) dir)
+ dir))))))
(defun emacs-repository-get-version (&optional dir external)
@@ -139,18 +139,36 @@ emacs-repository-get-version
the VCS if we cannot find any information ourselves."
(or dir (setq dir source-directory))
- (when (file-directory-p (expand-file-name ".git" dir))
- (if external
- (emacs-repository-version-git dir)
- (or (let ((files '("HEAD" "refs/heads/master"))
- file rev)
- (with-temp-buffer
- (while (and (not rev)
- (setq file (car files)))
- (setq file (expand-file-name (format ".git/%s" file) dir)
- files (cdr files)
- rev (emacs-repository--version-git-1 file))))
- rev)
- ;; AFAICS this doesn't work during dumping (bug#20799).
- (emacs-repository-version-git dir)))))
+ (let* ((base-dir (expand-file-name ".git" dir))
+ (in-main-worktree (file-directory-p base-dir))
+ (in-linked-worktree nil)
+ sub-dir)
+ ;; If the sources are in a linked worktree, .git is a file that points
to
+ ;; the location of the main worktree and the repo's administrative
files.
+ (when (and (not in-main-worktree)
+ (file-regular-p base-dir)
+ (file-readable-p base-dir))
+ (with-temp-buffer
+ (insert-file-contents base-dir)
+ (when (looking-at "gitdir: \\(.*\.git\\)\\(.*\\)$")
+ (setq base-dir (match-string 1)
+ sub-dir (concat base-dir (match-string 2))
+ in-linked-worktree t))))
+ ;; We've found a worktree, either main or linked.
+ (when (or in-main-worktree in-linked-worktree)
+ (if external
+ (emacs-repository-version-git dir)
+ (or (if in-linked-worktree
+ (emacs-repository--version-git-1
+ (expand-file-name "HEAD" sub-dir) base-dir)
+ (let ((files '("HEAD" "refs/heads/master"))
+ file rev)
+ (while (and (not rev)
+ (setq file (car files)))
+ (setq file (expand-file-name file base-dir)
+ files (cdr files)
+ rev (emacs-repository--version-git-1 file
base-dir)))
+ rev))
+ ;; AFAICS this doesn't work during dumping (bug#20799).
+ (emacs-repository-version-git dir))))))
;; We put version info into the executable in the form that `ident' uses.
[-- Attachment #2: Type: text/html, Size: 5837 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#21930: emacs-repository-get-version fails on linked worktrees
2015-11-16 3:46 bug#21930: emacs-repository-get-version fails on linked worktrees Juanma Barranquero
@ 2015-11-16 23:01 ` Stephen Leake
2015-11-17 0:20 ` Juanma Barranquero
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Leake @ 2015-11-16 23:01 UTC (permalink / raw)
To: Juanma Barranquero; +Cc: 21930
Juanma Barranquero <lekktu@gmail.com> writes:
> When run inside a linked worktree (created with "git worktree add ..."),
> emacs-repository-get-version needs to ask the VCS to find the repository
> version, which doesn't work during dumping.
I'm guessing because running any background process doesn't work during
dumping; they don't work in general in batch mode.
> I'd like to apply this patch to the release branch.
Looks good to me.
--
-- Stephe
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#21930: emacs-repository-get-version fails on linked worktrees
2015-11-16 23:01 ` Stephen Leake
@ 2015-11-17 0:20 ` Juanma Barranquero
2015-11-19 18:17 ` Juanma Barranquero
0 siblings, 1 reply; 6+ messages in thread
From: Juanma Barranquero @ 2015-11-17 0:20 UTC (permalink / raw)
To: Stephen Leake; +Cc: 21930
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
On Tue, Nov 17, 2015 at 12:01 AM, Stephen Leake <
stephen_leake@stephe-leake.org> wrote:
> I'm guessing because running any background process doesn't work during
> dumping; they don't work in general in batch mode.
The code refers to bug#20799, which states that git (and other external
processes) cannot be run while dumping because `exec-path' is nil.
So the function, to be usable on a linked worktree while dumping, needs to
directly read the .git file. That's what my patch does. Calls to
`emacs-repository-get-version' with EXTERNAL = t already work (when not
dumping) without my patch, of course.
> Looks good to me.
Great.
[-- Attachment #2: Type: text/html, Size: 851 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#21930: emacs-repository-get-version fails on linked worktrees
2015-11-17 0:20 ` Juanma Barranquero
@ 2015-11-19 18:17 ` Juanma Barranquero
2015-11-19 19:03 ` John Wiegley
0 siblings, 1 reply; 6+ messages in thread
From: Juanma Barranquero @ 2015-11-19 18:17 UTC (permalink / raw)
To: John Wiegley; +Cc: 21930
[-- Attachment #1: Type: text/plain, Size: 76 bytes --]
Ping.
John, it's OK to install this change in the emacs-25 branch?
[-- Attachment #2: Type: text/html, Size: 121 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#21930: emacs-repository-get-version fails on linked worktrees
2015-11-19 18:17 ` Juanma Barranquero
@ 2015-11-19 19:03 ` John Wiegley
2015-11-20 0:40 ` Juanma Barranquero
0 siblings, 1 reply; 6+ messages in thread
From: John Wiegley @ 2015-11-19 19:03 UTC (permalink / raw)
To: Juanma Barranquero; +Cc: 21930
>>>>> Juanma Barranquero <lekktu@gmail.com> writes:
> John, it's OK to install this change in the emacs-25 branch?
Yes, please do.
John
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#21930: emacs-repository-get-version fails on linked worktrees
2015-11-19 19:03 ` John Wiegley
@ 2015-11-20 0:40 ` Juanma Barranquero
0 siblings, 0 replies; 6+ messages in thread
From: Juanma Barranquero @ 2015-11-20 0:40 UTC (permalink / raw)
To: John Wiegley; +Cc: 21930-done
[-- Attachment #1: Type: text/plain, Size: 54 bytes --]
Done in c210b8b128c17929dbb8e0b0564ee25930d44dd1.
[-- Attachment #2: Type: text/html, Size: 76 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-11-20 0:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-16 3:46 bug#21930: emacs-repository-get-version fails on linked worktrees Juanma Barranquero
2015-11-16 23:01 ` Stephen Leake
2015-11-17 0:20 ` Juanma Barranquero
2015-11-19 18:17 ` Juanma Barranquero
2015-11-19 19:03 ` John Wiegley
2015-11-20 0:40 ` Juanma Barranquero
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).