Fixes for emacs-repository-get-version

* lisp/version.el (emacs-repository-get-version):
Check either .bzr or .git, but not both.
Make the git case actually use the DIR argument, and return nil
rather than the empty string.

* etc/NEWS: Don't mention that emacs-repository-version works for git,
because it only returns nil (since it uses %N and there seem to be no
notes in the git version of the Emacs repo.)
No idea why this change is in trunk during a feature freeze anyway.

diff --git a/etc/NEWS b/etc/NEWS
index f656fb9643142d9988de824b4a468c185b08b6d1..2e49a8fb4985b56c311b6e57f4fb95b6816149f4 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -236,8 +236,7 @@ simply disabling Transient Mark mode does the same thing.
 and this variable has been marked obsolete.
 
 ---
-** `emacs-bzr-version' has been renamed to `emacs-repository-version',
-and works for git too.
+** `emacs-bzr-version' has been renamed to `emacs-repository-version'.
 
 ** New user options:
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d0b8d646323f00475222e37e4e8113429e142b6a..1d957de8ba82e81e29b8c8bddb59abf24e1c8ec1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-22  Glenn Morris  <rgm@gnu.org>
+
+       * version.el (emacs-repository-get-version):
+       Check either .bzr or .git, but not both.
+       Make the git case actually use the DIR argument, and return nil
+       rather than the empty string.
+
 2014-01-22  Martin Rudalics  <rudalics@gmx.at>
 
        Fixes in window size functions around Bug#16430 and Bug#16470.

diff --git a/lisp/version.el b/lisp/version.el
index b2557142a78cfba5b4cfb7f94f3d3d21f87e68f1..d1d6c4c216b0249f22d718db640af6c60d4c1349 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -145,52 +145,50 @@ maybe ask the VCS itself, if the sources appear to be under
 version control.  If `force', always ask.  the VCS. Otherwise
 only ask the VCS if we cannot find any information ourselves."
   (or dir (setq dir source-directory))
-  (or 
-   ;; Bazaar case -- to be removed after transition
-   (when (file-directory-p (expand-file-name ".bzr/branch" dir))
-     (if (eq external 'force)
-        (emacs-bzr-version-bzr dir)
-       (let (file loc rev)
-        (cond ((file-readable-p
-                (setq file (expand-file-name ".bzr/branch/last-revision" dir)))
-               (with-temp-buffer
-                 (insert-file-contents file)
-                 (goto-char (point-max))
-                 (if (looking-back "\n")
-                     (delete-char -1))
-                 (buffer-string)))
-              ;; OK, no last-revision.  Is it a lightweight checkout?
-              ((file-readable-p
-                (setq file (expand-file-name ".bzr/branch/location" dir)))
-               (setq rev (emacs-bzr-version-dirstate dir))
-               ;; If the parent branch is local, try looking there for the rev.
-               ;; Note: there is no guarantee that the parent branch's rev
-               ;; corresponds to this branch.  This branch could have
-               ;; been made with a specific -r revno argument, or the
-               ;; parent could have been updated since this branch was created.
-               ;; To try and detect this, we check the dirstate revids
-               ;; to see if they match.
-               (if (and (setq loc (with-temp-buffer
-                                    (insert-file-contents file)
-                                    (if (looking-at "file://\\(.*\\)")
-                                        (match-string 1))))
-                        (equal rev (emacs-bzr-version-dirstate loc)))
-                   (emacs-bzr-get-version loc)
-                 ;; If parent does not match, the best we can do without
-                 ;; calling external commands is to use the dirstate rev.
-                 rev))
-              (external
-               (emacs-bzr-version-bzr dir))))))
-   ;; Git case
-  (when (file-directory-p (expand-file-name ".git" dir))
-    (message "Waiting for git...")
-    (with-temp-buffer
-      (if (zerop
-          (call-process "git" nil '(t nil) nil "log"
-                        "-1"
-                        "--pretty=format:%N"))
-         (replace-regexp-in-string "\n" "" (buffer-string)))))
-   ))
+  (cond ((file-directory-p (expand-file-name ".bzr/branch" dir))
+        (if (eq external 'force)
+            (emacs-bzr-version-bzr dir)
+          (let (file loc rev)
+            (cond ((file-readable-p
+                    (setq file (expand-file-name
+                                ".bzr/branch/last-revision" dir)))
+                   (with-temp-buffer
+                     (insert-file-contents file)
+                     (goto-char (point-max))
+                     (if (looking-back "\n")
+                         (delete-char -1))
+                     (buffer-string)))
+                  ;; OK, no last-revision.  Is it a lightweight checkout?
+                  ((file-readable-p
+                    (setq file (expand-file-name ".bzr/branch/location" dir)))
+                   (setq rev (emacs-bzr-version-dirstate dir))
+                   ;; If parent branch is local, try looking there for the rev.
+                   ;; Note: there is no guarantee that the parent branch's rev
+                   ;; corresponds to this branch.  This branch could have
+                   ;; been made with a specific -r revno argument, or the
+                   ;; parent could have been updated since this branch was
+                   ;; created.
+                   ;; To try and detect this, we check the dirstate revids
+                   ;; to see if they match.
+                   (if (and (setq loc (with-temp-buffer
+                                        (insert-file-contents file)
+                                        (if (looking-at "file://\\(.*\\)")
+                                            (match-string 1))))
+                            (equal rev (emacs-bzr-version-dirstate loc)))
+                       (emacs-repository-get-version loc)
+                     ;; If parent does not match, the best we can do without
+                     ;; calling external commands is to use the dirstate rev.
+                     rev))
+                  (external
+                   (emacs-bzr-version-bzr dir))))))
+       ((file-directory-p (expand-file-name ".git" dir))
+        (message "Waiting for git...")
+        (with-temp-buffer
+          (let ((default-directory (file-name-as-directory dir)))
+            (and (zerop (call-process "git" nil '(t nil) nil "log"
+                                      "-1" "--pretty=format:%N"))
+                 (not (zerop (buffer-size)))
+                 (replace-regexp-in-string "\n" "" (buffer-string))))))))
 
 ;; We put version info into the executable in the form that `ident' uses.
 (purecopy (concat "\n$Id: " (subst-char-in-string ?\n ?\s (emacs-version))