Replace "Maintainer: FSF" with the emacs-devel mailing address

[bpt/emacs.git] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 0362b03..68b502c 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1985, 1992, 1994-1995, 1999-2014 Free Software
 ;; Foundation, Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
 ;; Package: emacs
 
@@ -106,7 +106,7 @@ Returns nil if unable to find this information."
              (looking-at "[0-9]+\0\\([^\0\n]+\\)\0")
              (match-string 1))))))
 
-(defun emacs-bzr-version-bzr (_dir)
+(defun emacs-bzr-version-bzr (dir)
   "Ask bzr itself for the version information for directory DIR."
   ;; Comments on `bzr version-info':
   ;; i) Unknown files also cause clean != 1.
@@ -125,9 +125,12 @@ Returns nil if unable to find this information."
          (call-process "bzr" nil '(t nil) nil "version-info"
                        "--custom"
                        "--template={revno} {revision_id} (clean = {clean})"
-                       "dir"))
+                       dir))
         (buffer-string))))
 
+(define-obsolete-function-alias 'emacs-bzr-get-version
+                                'emacs-repository-get-version "24.4")
+
 (defun emacs-repository-get-version (&optional dir external)
   "Try to return as a string the repository revision of the Emacs sources.
 The format of the returned string is dependent on the VCS in use.
@@ -142,40 +145,53 @@ 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))
-  (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)))))))
+  (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 (eq 0
+                     (condition-case nil
+                         (call-process "git" nil '(t nil) nil "log"
+                                       "-1" "--pretty=format:%N")
+                       (error nil)))
+                 (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))