Rev 4554: (jml) Merge in changes from 1.17. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Jul 20 13:47:11 BST 2009
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 4554 [merge]
revision-id: pqm at pqm.ubuntu.com-20090720124706-b52fp9fcciu17np7
parent: pqm at pqm.ubuntu.com-20090720085645-54mtgybxua0yx6hw
parent: jml at canonical.com-20090720112705-ss4o5s3zw3dbxsek
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-07-20 13:47:06 +0100
message:
(jml) Merge in changes from 1.17.
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_known_graph_pyx.pyx _known_graph_pyx.pyx-20090610194911-yjk73td9hpjilas0-1
tools/generate_docs.py bzrinfogen.py-20051211224525-78e7c14f2c955e55
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
=== modified file 'Makefile'
--- a/Makefile 2009-07-14 07:04:15 +0000
+++ b/Makefile 2009-07-20 11:27:05 +0000
@@ -176,14 +176,14 @@
$(wildcard $(addsuffix /*.txt, bzrlib/help_topics/en))
doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
- PYTHONPATH=.:$$PYTHONPATH $(PYTHON) tools/generate_docs.py -o $@ rstx
+ $(PYTHON) tools/generate_docs.py -o $@ rstx
doc/en/release-notes/NEWS.txt: NEWS
$(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
MAN_PAGES = man1/bzr.1
man1/bzr.1: $(MAN_DEPENDENCIES)
- PYTHONPATH=.:$$PYTHONPATH $(PYTHON) tools/generate_docs.py -o $@ man
+ $(PYTHON) tools/generate_docs.py -o $@ man
upgrade_guide_dependencies = $(wildcard $(addsuffix /*.txt, doc/en/upgrade-guide))
=== modified file 'NEWS'
--- a/NEWS 2009-07-20 08:56:45 +0000
+++ b/NEWS 2009-07-20 11:27:05 +0000
@@ -33,9 +33,6 @@
* ``bzr mv`` no longer takes out branch locks, which allows it to work
when the branch is readonly. (Robert Collins, #216541)
-* ``bzr serve`` once again applies a ``ChrootServer`` to the given
- directory before serving it. (Andrew Bennetts, #400535)
-
* Fixed a NameError that occurs when merging or pulling from a URL that
causes a redirection loop when bzr tries to read a URL as a bundle.
(Andrew Bennetts, #400847)
@@ -87,8 +84,12 @@
disk. (Robert Collins)
-bzr 1.17rc1 "So late it's brunch" 2009-07-13
-############################################
+bzr 1.17 "So late it's brunch" 2009-07-20
+#########################################
+:Codename: so-late-its-brunch
+:1.17rc1: 2009-07-13
+:1.17: 2009-07-20
+
Bazaar continues to blaze a straight and shining path to the 2.0 release and
the elevation of the ``2a`` beta format to the full glory of "supported and
@@ -100,6 +101,21 @@
annoying progress bar artifacts.
+Changes from 1.17rc1 to 1.17final
+*********************************
+
+* Change an extension to call the python ``frozenset()`` rather than the C
+ api ``PyFrozenSet_New``. It turns out that python2.4 did not expose the
+ C api. (John Arbash Meinel, #399366)
+
+* Fixes for the Makefile and the rename of ``generate_docs.py`` to
+ ``tools/generate_docs.py`` to allow everything to be built on Windows.
+ (John Arbash Meinel, #399356)
+
+* ``bzr serve`` once again applies a ``ChrootServer`` to the given
+ directory before serving it. (Andrew Bennetts, #400535)
+
+
Compatibility Breaks
********************
=== modified file 'bzrlib/_known_graph_pyx.pyx'
--- a/bzrlib/_known_graph_pyx.pyx 2009-06-19 20:35:35 +0000
+++ b/bzrlib/_known_graph_pyx.pyx 2009-07-14 16:10:32 +0000
@@ -25,8 +25,6 @@
ctypedef struct PyObject:
pass
- object PyFrozenSet_New(object)
-
object PyTuple_New(Py_ssize_t n)
Py_ssize_t PyTuple_GET_SIZE(object t)
PyObject * PyTuple_GET_ITEM(object t, Py_ssize_t o)
@@ -267,7 +265,7 @@
cdef Py_ssize_t pos, last_item
cdef long min_gdfo
- heads_key = PyFrozenSet_New(keys)
+ heads_key = frozenset(keys)
maybe_heads = PyDict_GetItem(self._known_heads, heads_key)
if maybe_heads != NULL:
return <object>maybe_heads
@@ -285,7 +283,7 @@
if not candidate_nodes:
return frozenset([NULL_REVISION])
# The keys changed, so recalculate heads_key
- heads_key = PyFrozenSet_New(candidate_nodes)
+ heads_key = frozenset(candidate_nodes)
if PyDict_Size(candidate_nodes) < 2:
return heads_key
@@ -330,7 +328,7 @@
node = <_KnownGraphNode>temp_node
if not node.seen:
PyList_Append(heads, node.key)
- heads = PyFrozenSet_New(heads)
+ heads = frozenset(heads)
for pos from 0 <= pos < PyList_GET_SIZE(cleanup):
node = _get_list_node(cleanup, pos)
node.seen = 0
=== modified file 'tools/generate_docs.py'
--- a/tools/generate_docs.py 2009-06-19 09:27:13 +0000
+++ b/tools/generate_docs.py 2009-07-14 15:01:19 +0000
@@ -32,12 +32,13 @@
Run "%(prog)s --help" for the option reference.
"""
-
-import bzrlib.commands
+import os
import sys
from optparse import OptionParser
-from bzrlib import doc_generate
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+
+from bzrlib import commands, doc_generate
def main(argv):
parser = OptionParser(usage="""%prog [options] OUTPUT_FORMAT
@@ -69,8 +70,8 @@
if len(args) != 2:
parser.print_help()
sys.exit(1)
-
- bzrlib.commands.install_bzr_command_hooks()
+
+ commands.install_bzr_command_hooks()
infogen_type = args[1]
infogen_mod = doc_generate.get_module(infogen_type)
=== modified file 'tools/win32/build_release.py'
--- a/tools/win32/build_release.py 2009-06-17 18:11:58 +0000
+++ b/tools/win32/build_release.py 2009-07-14 15:00:14 +0000
@@ -4,12 +4,12 @@
# When preparing a new release, make sure to set all of these to the latest
# values.
VERSIONS = {
- 'bzr': '1.16',
- 'qbzr': '0.11.0',
- 'bzrtools': '1.16.0',
- 'bzr-svn': '0.6.1',
- 'bzr-rebase': '0.5.0',
- 'subvertpy': '0.6.7',
+ 'bzr': '1.17',
+ 'qbzr': '0.12',
+ 'bzrtools': '1.17.0',
+ 'bzr-svn': '0.6.3-win32-1',
+ 'bzr-rewrite': '0.5.1',
+ 'subvertpy': '0.6.8',
}
# This will be passed to 'make' to ensure we build with the right python
@@ -125,7 +125,7 @@
def _plugin_tag_name(plugin_name):
- if plugin_name in ('bzr-svn', 'bzr-rebase', 'subvertpy'):
+ if plugin_name in ('bzr-svn', 'bzr-rewrite', 'subvertpy'):
return '%s-%s' % (plugin_name, VERSIONS[plugin_name])
# bzrtools and qbzr use 'release-X.Y.Z'
return 'release-' + VERSIONS[plugin_name]
@@ -134,7 +134,7 @@
def update_plugin(plugin_name):
release_dir = get_plugin_release_dir(plugin_name)
if not os.path.isdir(plugin_name):
- if plugin_name in ('bzr-svn', 'bzr-rebase'):
+ if plugin_name in ('bzr-svn', 'bzr-rewrite'):
# bzr-svn uses a different repo format
call_or_fail([bzr(), 'init-repo', '--rich-root-pack', plugin_name])
else:
@@ -195,7 +195,7 @@
install_plugin('bzrtools')
install_plugin('qbzr')
install_plugin('bzr-svn')
- install_plugin('bzr-rebase')
+ install_plugin('bzr-rewrite')
build_installer()
More information about the bazaar-commits
mailing list