In preparation for the move to git, sanitize out some Bazaar-specific…

… names.

* version.el (emacs-bzr-version): Name changed to
emacs-repository-version.
* loadup.el: Follow through on this name change.
* lisp/mail/emacsbug.el (report-emacs-bug): Factor out any
assumption about the version control system in use.

etc/NEWS

@@ -1471,8 +1471,8 @@ respectively, without exiting from the prompt.
 ** In the Package Menu, newly-available packages are listed as "new",
 and sorted above the other "available" packages by default.
 
-** If your Emacs was built from a bzr checkout, the new variable
-`emacs-bzr-version' contains information about the bzr revision used.
+** If your Emacs was built from a repository checkout, the new variable
+`emacs-repository-version' contains information about the bzr revision used.
 
 ** New option `create-lockfiles' specifies usage of lockfiles.
 It defaults to t.  Changing it to nil inhibits the creation of lock

lisp/ChangeLog

@@ -1,3 +1,14 @@
+2014-01-08  Eric S. Raymond  <esr@thyrsus.com>
+
+	In preparation for the move to git, sanitize out some
+	Bazaar-specific names.
+
+	* version.el (emacs-bzr-version): Name changed to
+	emacs-repository-version.
+	* loadup.el: Follow through on this name change.
+	* lisp/mail/emacsbug.el (report-emacs-bug): Factor out any
+	assumption about the version control system in use.
+
 2014-01-08  David Engster  <deng@randomsample.de>
 
 	* help-fns.el (help-fns-describe-function-functions): New

lisp/loadup.el

@@ -328,7 +328,7 @@ lost after dumping")))
 				(string-to-number
 				 (substring name (length base) exelen))))
 			     files)))
-      (setq emacs-bzr-version (condition-case nil (emacs-bzr-get-version)
+      (setq emacs-repository-version (condition-case nil (emacs-repository-get-version)
                               (error nil)))
       ;; `emacs-version' is a constant, so we shouldn't change it with `setq'.
       (defconst emacs-version

lisp/mail/emacsbug.el

@@ -230,8 +230,8 @@ usually do not have translators for other languages.\n\n")))
       (insert (propertize "\n" 'display txt)))
 
     (insert "\n\nIn " (emacs-version) "\n")
-    (if (stringp emacs-bzr-version)
-	(insert "Bzr revision: " emacs-bzr-version "\n"))
+    (if (stringp emacs-repository-version)
+	(insert "Repository revision: " emacs-repository-version "\n"))
     (if (fboundp 'x-server-vendor)
 	(condition-case nil
             ;; This is used not only for X11 but also W32 and others.

lisp/version.el

@@ -85,7 +85,7 @@ to the system configuration; look at `system-configuration' instead."
 (defalias 'version 'emacs-version)
 
 ;; Set during dumping, this is a defvar so that it can be setq'd.
-(defvar emacs-bzr-version nil
+(defvar emacs-repository-version nil
   "String giving the bzr revision from which this Emacs was built.
 The format is: [revno] revision_id, where revno may be absent.
 Value is nil if Emacs was not built from a bzr checkout, or if we could
@@ -126,7 +126,7 @@ Returns nil if unable to find this information."
                        "dir"))
         (buffer-string))))
 
-(defun emacs-bzr-get-version (&optional dir external)
+(defun emacs-repository-get-version (&optional dir external)
   "Try to return as a string the bzr revision of the Emacs sources.
 The format is: [revno] revision_id, where revno may be absent.
 Value is nil if the sources do not seem to be under bzr, or if we could