[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115926: In preparation for the move to git, sanitiz
From: |
Eric S. Raymond |
Subject: |
[Emacs-diffs] trunk r115926: In preparation for the move to git, sanitize out some Bazaar-specific names. |
Date: |
Wed, 08 Jan 2014 22:58:23 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115926
revision-id: address@hidden
parent: address@hidden
committer: Eric S. Raymond <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-08 17:57:47 -0500
message:
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.
modified:
etc/NEWS news-20100311060928-aoit31wvzf25yr1z-1
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/loadup.el loadup.el-20091113204419-o5vbwnq5f7feedwu-49
lisp/mail/emacsbug.el emacsbug.el-20091113204419-o5vbwnq5f7feedwu-73
lisp/version.el version.el-20091113204419-o5vbwnq5f7feedwu-1613
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2014-01-07 04:36:52 +0000
+++ b/etc/NEWS 2014-01-08 22:57:47 +0000
@@ -1471,8 +1471,8 @@
** 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
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-01-08 21:59:19 +0000
+++ b/lisp/ChangeLog 2014-01-08 22:57:47 +0000
@@ -1,3 +1,14 @@
+2014-01-08 Eric S. Raymond <address@hidden>
+
+ 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 <address@hidden>
* help-fns.el (help-fns-describe-function-functions): New
=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el 2014-01-01 07:43:34 +0000
+++ b/lisp/loadup.el 2014-01-08 22:57:47 +0000
@@ -328,7 +328,7 @@
(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
=== modified file 'lisp/mail/emacsbug.el'
--- a/lisp/mail/emacsbug.el 2014-01-06 06:25:30 +0000
+++ b/lisp/mail/emacsbug.el 2014-01-08 22:57:47 +0000
@@ -230,8 +230,8 @@
(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.
=== modified file 'lisp/version.el'
--- a/lisp/version.el 2014-01-01 07:43:34 +0000
+++ b/lisp/version.el 2014-01-08 22:57:47 +0000
@@ -85,7 +85,7 @@
(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 @@
"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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115926: In preparation for the move to git, sanitize out some Bazaar-specific names.,
Eric S. Raymond <=