[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 r117642: Backport changes in preparation for git
|
From: |
Eli Zaretskii |
|
Subject: |
[Emacs-diffs] emacs-24 r117642: Backport changes in preparation for git migration from trunk. |
|
Date: |
Fri, 31 Oct 2014 09:05:44 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117642
revision-id: address@hidden
parent: address@hidden
author: Eric S. Raymond <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-10-31 11:03:23 +0200
message:
Backport changes in preparation for git migration from trunk.
admin: Changes in several documents.
autogen.sh: Neutralize language specific to a repository type.
doc/misc/efaq-w32.texi: Neutralized language specific to a repository type.
doc/misc/gnus-coding.txt: Neutralized language specific to a repository type.
lisp/Makefile.in: Change some production names so they're neutral
about the repository type.
removed:
admin/notes/BRANCH branch-20091113204419-o5vbwnq5f7feedwu-3013
renamed:
admin/notes/bzr => admin/notes/repo bzr-20100518025134-ebvhi2w74h1r56u7-1
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
admin/check-doc-strings
checkdocstrings-20091113204419-o5vbwnq5f7feedwu-2206
admin/notes/copyright copyright-20091113204419-o5vbwnq5f7feedwu-4445
admin/notes/hydra hydra-20130810225402-nqewbup590g4qj3h-1
admin/notes/years years-20091113204419-o5vbwnq5f7feedwu-3407
admin/update-copyright
updatecopyright-20131224182540-13jihphyl48dj7pc-1
autogen.sh autogen.sh-20091113204419-o5vbwnq5f7feedwu-2495
doc/misc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-6331
doc/misc/efaq-w32.texi efaqw32.texi-20130827074758-tqx1zcy5tz9w2k3a-1
doc/misc/efaq.texi faq.texi-20091113204419-o5vbwnq5f7feedwu-6301
doc/misc/gnus-coding.texi
gnuscoding.texi-20091113204419-o5vbwnq5f7feedwu-7530
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
lisp/makefile.w32-in
makefile.w32in-20091113204419-o5vbwnq5f7feedwu-1912
lisp/man.el man.el-20091113204419-o5vbwnq5f7feedwu-582
nt/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1545
nt/INSTALL install.msys-20130416132004-cxmtwcclsy15p2r8-1
nt/INSTALL.OLD install-20091113204419-o5vbwnq5f7feedwu-1546
nt/zipdist.bat zipdist.bat-20100724120309-zt7satkj27ctza5v-1
test/automated/thingatpt.el thingatpt.el-20130204112937-2fkdj191qn8cak44-1
admin/notes/repo bzr-20100518025134-ebvhi2w74h1r56u7-1
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-10-23 05:52:47 +0000
+++ b/ChangeLog 2014-10-31 09:03:23 +0000
@@ -1,3 +1,7 @@
+2014-10-31 Eric S. Raymond <address@hidden>
+
+ * autogen.sh: Neutralize language specific to a repository type.
+
2014-10-23 Paul Eggert <address@hidden>
* Makefile.in (${srcdir}/info/dir): Make sure info directory exists.
=== modified file 'admin/check-doc-strings'
--- a/admin/check-doc-strings 2014-01-02 08:47:40 +0000
+++ b/admin/check-doc-strings 2014-10-31 09:03:23 +0000
@@ -18,7 +18,7 @@
This program is in the public domain.\n";
die $usage if @ARGV;
-die $usage unless -r "src/alloc.c" && -d ".bzr" && -d "lisp";
+die $usage unless -r "src/alloc.c" && -d "lisp";
my %texi_funtype;
my %texi_arglist;
=== removed file 'admin/notes/BRANCH'
--- a/admin/notes/BRANCH 2011-03-08 00:08:03 +0000
+++ b/admin/notes/BRANCH 1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-You can view the available Emacs branches at
-
-http://bzr.savannah.gnu.org/r/emacs/
-
-Development normally takes places on the trunk.
-Sometimes specialized features are developed on separate branches
-before possibly being merged to the trunk.
-
-Development is discussed on the emacs-devel mailing list.
-
-Sometime before the release of a new major version of Emacs (eg 23.2),
-a "feature freeze" is imposed on the trunk. No new features may be
-added after this point. This is usually some months before the release.
-
-Shortly before the release, a release branch is created, and the
-trunk is then free for development.
-For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for
-23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x.
-
-Consult emacs-devel for exactly what kinds of changes are allowed
-on what branch at any time.
-
-If you are looking at this file in a branch other than the trunk,
-there may be some branch-specific documentation below this line.
-________________________________________________________________________
-
-* elpa
-
- This branch does not contain a copy of Emacs, but of the Emacs Lisp
- package archive (elpa.gnu.org). See admin/notes/elpa for further
- explanation, and the README file in the branch for usage
- instructions.
=== modified file 'admin/notes/copyright'
--- a/admin/notes/copyright 2014-01-01 07:43:34 +0000
+++ b/admin/notes/copyright 2014-10-31 09:03:23 +0000
@@ -24,7 +24,7 @@
2. When installing code written by someone else, the ChangeLog entry
should be in the name of the author of the code, not the person who
-installs it. Also use bzr commit's "--author" option.
+installs it. Also use commit's "--author" option.
Do not install any of your own changes in the same commit.
3. With images, add the legal info to a README file in the directory
@@ -493,10 +493,10 @@
obviously good):
-Is it OK to just `bzr remove' a file for legal reasons, or is
-something more drastic needed? A removed file is still available from
-the repository, if suitable options are applied. (This issue obviously
-does not affect a release).
+Is it OK to just remove a file for legal reasons, or is something more
+drastic (excision from the entire repository history) needed? A
+removed file is still available from the repository, if suitable
+options are applied. (This issue obviously does not affect a release).
rms: will ask lawyer
=== modified file 'admin/notes/hydra'
--- a/admin/notes/hydra 2014-01-01 07:43:34 +0000
+++ b/admin/notes/hydra 2014-10-31 09:03:23 +0000
@@ -26,7 +26,7 @@
* The Emacs jobset consists of the following jobs:
** The `tarball' job
-which gets a checkout from bzr, and does a bootstrap followed
+which gets a checkout from the repository, and does a bootstrap followed
by running make-dist to create a tarball. If this job fails, all the
others will too (because they use the tarball as input).
=== renamed file 'admin/notes/bzr' => 'admin/notes/repo'
--- a/admin/notes/bzr 2014-04-17 21:20:51 +0000
+++ b/admin/notes/repo 2014-10-31 09:03:23 +0000
@@ -1,6 +1,39 @@
-NOTES ON COMMITTING TO EMACS'S BAZAAR REPO -*- outline -*-
+NOTES ON COMMITTING TO EMACS'S REPOSITORY -*- outline -*-
+
+* Commit to the right branch
+
+You can view the available Emacs branches at
+
+http://bzr.savannah.gnu.org/r/emacs/
+
+Development normally takes places on the trunk.
+Sometimes specialized features are developed on separate branches
+before possibly being merged to the trunk.
+
+Development is discussed on the emacs-devel mailing list.
+
+Sometime before the release of a new major version of Emacs
+a "feature freeze" is imposed on the trunk. No new features may be
+added after this point. This is usually some months before the release.
+
+Shortly before the release, a release branch is created, and the
+trunk is then free for development.
+
+For example, "emacs-23" for Emacs 23.2 and later, "EMACS_23_1_RC" for
+23.1, "EMACS_22_BASE" for 22.x, and "EMACS_21_1_RC" for 21.x.
+
+Consult emacs-devel for exactly what kinds of changes are allowed
+on what branch at any time.
+
+** elpa
+
+This branch does not contain a copy of Emacs, but of the Emacs Lisp
+package archive (elpa.gnu.org). See admin/notes/elpa for further
+explanation, and the README file in the branch for usage
+instructions.
* Install changes only on one branch, let them get merged elsewhere if needed.
+
In particular, install bug-fixes only on the release branch (if there
is one) and let them get synced to the trunk; do not install them by
hand on the trunk as well. E.g. if there is an active "emacs-24" branch
@@ -19,6 +52,7 @@
in the commit log that it should not be merged to the trunk; see below).
* Backporting a bug-fix from the trunk to a branch (e.g. "emacs-24").
+
Indicate in the commit log that there is no need to merge the commit
to the trunk. Anything that matches `bzrmerge-skip-regexp' will do;
eg start the commit message with "Backport:". This is helpful for the
@@ -27,6 +61,7 @@
http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00262.html
* Installing changes from your personal branches.
+
If your branch has only a single commit, or many different real
commits, it is fine to do a merge. If your branch has only a very
small number of "real" commits, but several "merge from trunks", it is
@@ -47,6 +82,7 @@
http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
* Installing changes from gnulib
+
Some of the files in Emacs are copied from gnulib. To synchronize
these files from the version of gnulib that you have checked out into
a sibling directory of your branch, type "admin/merge-gnulib"; this
=== modified file 'admin/notes/years'
--- a/admin/notes/years 2013-12-25 23:25:32 +0000
+++ b/admin/notes/years 2014-10-31 09:03:23 +0000
@@ -2,7 +2,7 @@
Maintaining copyright years is now very simple: every time a new year
rolls around, add that year to every FSF (and AIST) copyright notice.
-Do this by running the 'admin/update-copyright' script on a fresh bzr
+Do this by running the 'admin/update-copyright' script on a fresh repo
checkout. Inspect the results for plausibility, then commit them.
There's no need to worry about whether an individual file has changed
=== modified file 'admin/update-copyright'
--- a/admin/update-copyright 2014-01-01 07:43:34 +0000
+++ b/admin/update-copyright 2014-10-31 09:03:23 +0000
@@ -45,14 +45,15 @@
} &&
rm $emacsver.aux &&
-bzr_files=$(bzr ls -RV --kind file) &&
+# FIXME: command will soon need to be replaced with "git ls-files"
+repo_files=$(bzr ls -RV --kind file) &&
# Do not update the copyright of files that have one or more of the
# following problems:
# . They are license files, maintained by the FSF, with their own dates.
# . Their format cannot withstand changing the contents of copyright strings.
-updatable_files=$(find $bzr_files \
+updatable_files=$(find $repo_files \
! -name COPYING \
! -name doclicense.texi \
! -name gpl.texi \
=== modified file 'autogen.sh'
--- a/autogen.sh 2014-02-10 01:34:22 +0000
+++ b/autogen.sh 2014-10-31 09:03:23 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-### autogen.sh - tool to help build Emacs from a bzr checkout
+### autogen.sh - tool to help build Emacs from a repository checkout
## Copyright (C) 2011-2014 Free Software Foundation, Inc.
@@ -23,8 +23,8 @@
### Commentary:
-## The Emacs bzr repository does not include the configure script
-## (and associated helpers). The first time you fetch Emacs from bzr,
+## The Emacs repository does not include the configure script (and
+## associated helpers). The first time you fetch Emacs from the repo,
## run this script to generate the necessary files.
## For more details, see the file INSTALL.REPO.
@@ -143,7 +143,7 @@
cat <<EOF
-Building Emacs from Bzr requires the following specialized programs:
+Building Emacs from the repository requires the following specialized programs:
EOF
for prog in $progs; do
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2014-10-30 02:58:11 +0000
+++ b/doc/misc/ChangeLog 2014-10-31 09:03:23 +0000
@@ -1,3 +1,9 @@
+2014-10-31 Eric S. Raymond <address@hidden>
+
+ * efaq-w32.texi: Neutralized language specific to a repository type.
+
+ * gnus-coding.txt: Neutralized language specific to a repository type.
+
2014-10-30 Glenn Morris <address@hidden>
* efaq.texi (Gnus does not work with NNTP): Remove; ancient.
=== modified file 'doc/misc/efaq-w32.texi'
--- a/doc/misc/efaq-w32.texi 2014-06-08 23:39:23 +0000
+++ b/doc/misc/efaq-w32.texi 2014-10-31 09:03:23 +0000
@@ -176,7 +176,7 @@
distributed as a compressed tar file, digitally signed by the maintainer
who made the release.
address@hidden Bzr, getting Emacs
address@hidden getting Emacs
@cindex latest development version of Emacs
@cindex Emacs Development
The development version of Emacs is available from
@@ -199,8 +199,8 @@
equivalents are not consistent between versions. GNU texinfo will be
required to build the manuals. @xref{Other useful ports}.
-After unpacking the source, or checking out of Bzr, be sure to read the
-instructions in @file{nt/README} and @file{nt/INSTALL}.
+After unpacking the source, or checking out of the repository, be sure
+to read the instructions in @file{nt/README} and @file{nt/INSTALL}.
@node Debugging
@section How do I use a debugger on Emacs?
=== modified file 'doc/misc/efaq.texi'
--- a/doc/misc/efaq.texi 2014-10-30 02:58:11 +0000
+++ b/doc/misc/efaq.texi 2014-10-31 09:03:23 +0000
@@ -986,10 +986,8 @@
version (e.g., @samp{23.0.50} is what will eventually become @samp{23.1}).
Emacs is under active development, hosted at
address@hidden://savannah.gnu.org/projects/emacs/, Savannah}. The source
-code can be retrieved anonymously following the
address@hidden://savannah.gnu.org/bzr/?group=emacs, instructions}.
-The repository is GNU Bazaar.
address@hidden://savannah.gnu.org/projects/emacs/, Savannah}.
+Follow the instructions given there to clone the project repository.
Because Emacs undergoes many changes before a release, the version
number of a development version is not especially meaningful. It is
=== modified file 'doc/misc/gnus-coding.texi'
--- a/doc/misc/gnus-coding.texi 2014-05-07 17:34:53 +0000
+++ b/doc/misc/gnus-coding.texi 2014-10-31 09:03:23 +0000
@@ -313,17 +313,17 @@
new @file{encrypt.el}), you should probably make the change in the Emacs
tree, and it will show up in the Gnus tree a few days later.
-If you don't have Emacs bzr access (or it's inconvenient), you can
-change such a file in the v5-10 branch, and it should propagate to Emacs
-bzr---however, it will get some extra scrutiny (by Miles) to see if the
-changes are possibly controversial and need discussion on the mailing
-list. Many changes are obvious bug-fixes however, so often there won't
-be any problem.
+If you don't have Emacs repository access (or it's inconvenient), you
+can change such a file in the v5-10 branch, and it should propagate to
+the Emacs repository---however, it will get some extra scrutiny (by
+Miles) to see if the changes are possibly controversial and need
+discussion on the mailing list. Many changes are obvious bug-fixes
+however, so often there won't be any problem.
@item
If it's to a Gnus file, and it's important enough that it should be part
of Emacs and the v5-10 branch, then you can make the change on the v5-10
-branch, and it will go into Emacs bzr and the Gnus git trunk (a few days
+branch, and it will go into Emacs and the Gnus git trunk (a few days
later). The most prominent examples for such changes are bug-fixed
including improvements on the documentation.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-30 19:19:49 +0000
+++ b/lisp/ChangeLog 2014-10-31 09:03:23 +0000
@@ -1,3 +1,8 @@
+2014-10-31 Eric S. Raymond <address@hidden>
+
+ * Makefile.in: Change some production names so they're neutral
+ about the repository type.
+
2014-10-30 Kim F. Storm <address@hidden>
Restore cua-delete-copy-to-register-0 and M-v command (bug#18886).
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2014-10-20 22:21:56 +0000
+++ b/lisp/Makefile.in 2014-10-31 09:03:23 +0000
@@ -206,18 +206,18 @@
$(srcdir)/../build-aux/update-subdirs $$file; \
done;
-.PHONY: updates bzr-update update-authors
+.PHONY: updates repo-update update-authors
# Some modes of make-dist use this.
updates: update-subdirs autoloads finder-data custom-deps
-# This is useful after "bzr up"; but it doesn't do anything that a
+# This is useful after a repostiory fetch; but it doesn't do anything that a
# plain "make" at top-level doesn't.
# The only difference between this and this directory's "all" rule
# is that this runs "autoloads" as well (because it uses "compile"
# rather than "compile-main"). In a bootstrap, $(lisp) in src/Makefile
# triggers this directory's autoloads rule.
-bzr-update: compile finder-data custom-deps
+repo-update: compile finder-data custom-deps
# Update the AUTHORS file.
=== modified file 'lisp/makefile.w32-in'
--- a/lisp/makefile.w32-in 2014-01-01 07:43:34 +0000
+++ b/lisp/makefile.w32-in 2014-10-31 09:03:23 +0000
@@ -257,11 +257,11 @@
updates: $(lisp)/subdirs.el autoloads mh-autoloads finder-data custom-deps
-# This is useful after "bzr up".
-bzr-update: recompile autoloads finder-data custom-deps
+# This is useful after a repository fetch.
+repo-update: recompile autoloads finder-data custom-deps
# For backwards compatibility:
-cvs-update: bzr-update
+cvs-update: repo-update
# Update the AUTHORS file.
=== modified file 'lisp/man.el'
--- a/lisp/man.el 2014-02-10 01:34:22 +0000
+++ b/lisp/man.el 2014-10-31 09:03:23 +0000
@@ -840,7 +840,7 @@
foo(sec)[, bar(sec) [, ...]] [other stuff] - description
For more details and some regression tests, please see
-test/automated/man-tests.el in the emacs bzr repository."
+test/automated/man-tests.el in the emacs repository."
(goto-char (point-min))
;; See man-tests for data about which systems use which format (hopefully we
;; will be able to simplify the code if/when some of those formats aren't
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2014-10-26 18:37:16 +0000
+++ b/nt/ChangeLog 2014-10-31 09:03:23 +0000
@@ -1,3 +1,7 @@
+2014-10-31 Eric S. Raymond <address@hidden>
+
+ * Neutralize language specific to a repository type.
+
2014-10-26 Dani Moncayo <address@hidden>
* README.W32 (Preliminaries): Don't assume that this file is at
=== modified file 'nt/INSTALL'
--- a/nt/INSTALL 2014-06-04 16:44:04 +0000
+++ b/nt/INSTALL 2014-10-31 09:03:23 +0000
@@ -169,7 +169,7 @@
you are building from the repository:
. Texinfo (needed to produce the Info manuals when building from
- bzr/git, and for "make install")
+ the repository, and for "make install")
Available from http://sourceforge.net/projects/ezwinports/files/.
=== modified file 'nt/INSTALL.OLD'
--- a/nt/INSTALL.OLD 2014-01-01 07:43:34 +0000
+++ b/nt/INSTALL.OLD 2014-10-31 09:03:23 +0000
@@ -126,7 +126,7 @@
http://sourceforge.net/projects/ezwinports/files/
In addition to this file, if you build a development snapshot, you
- should also read INSTALL.BZR in the parent directory.
+ should also read INSTALL.REPO in the parent directory.
* Supported development environments
@@ -575,7 +575,7 @@
* Creating binary distributions
Binary distributions (full and barebin distributions) can be
- automatically built and packaged from source tarballs or a bzr
+ automatically built and packaged from source tarballs or a repository
checkout.
When building Emacs binary distributions, the --distfiles argument
=== modified file 'nt/zipdist.bat'
--- a/nt/zipdist.bat 2014-01-01 07:43:34 +0000
+++ b/nt/zipdist.bat 2014-10-31 09:03:23 +0000
@@ -36,7 +36,7 @@
rem Build and verify the binary distribution
:ZIP_DIST
-7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb
-xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip
%TMP_DIST_DIR%
+7z a -bd -tZIP -mx=9 -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~
-xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR%
7z t emacs-%EMACS_VER%-bin-i386.zip
goto EXIT
=== modified file 'test/automated/thingatpt.el'
--- a/test/automated/thingatpt.el 2014-01-01 07:43:34 +0000
+++ b/test/automated/thingatpt.el 2014-10-31 09:03:23 +0000
@@ -26,7 +26,6 @@
("http://2.gnu.org"; 6 url "http://2.gnu.org";)
("http://3.gnu.org"; 19 url "http://3.gnu.org";)
("https://4.gnu.org"; 1 url "https://4.gnu.org";)
- ("bzr://savannah.gnu.org" 1 url "bzr://savannah.gnu.org")
("A geo URI (geo:3.14159,-2.71828)." 12 url "geo:3.14159,-2.71828")
("Visit http://5.gnu.org now." 5 url nil)
("Visit http://6.gnu.org now." 7 url "http://6.gnu.org";)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 r117642: Backport changes in preparation for git migration from trunk.,
Eli Zaretskii <=