[Pkg-bazaar-commits] ./bzr/unstable r3841: New upstream release.
Jelmer Vernooij
jelmer at samba.org
Thu Jun 18 12:51:54 UTC 2009
------------------------------------------------------------
revno: 3841
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: unstable
timestamp: Thu 2009-06-18 14:51:54 +0200
message:
New upstream release.
modified:
NEWS
bzrlib/__init__.py
bzrlib/builtins.py
bzrlib/bzrdir.py
bzrlib/help_topics/__init__.py
bzrlib/repofmt/groupcompress_repo.py
bzrlib/repository.py
bzrlib/smart/bzrdir.py
bzrlib/smart/request.py
bzrlib/tests/blackbox/test_init.py
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
bzrlib/tests/test_remote.py
bzrlib/tests/test_smart.py
debian/changelog
------------------------------------------------------------
revno: 3815.777.1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Thu 2009-06-11 15:05:58 +0100
message:
(jml) Merge in changes from trunk that belong in 1.16rc1.
modified:
NEWS
bzrlib/__init__.py
bzrlib/bzrdir.py
bzrlib/remote.py
bzrlib/smart/bzrdir.py
bzrlib/tests/blackbox/test_pull.py
bzrlib/tests/blackbox/test_push.py
bzrlib/tests/branch_implementations/test_stacking.py
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
bzrlib/tests/test_bzrdir.py
bzrlib/tests/test_smart.py
------------------------------------------------------------
revno: 3815.777.2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Fri 2009-06-12 05:52:27 +0100
message:
(jml) Merge in overnight changes to trunk. This is the code of the
1.16rc1.
modified:
NEWS
bzrlib/builtins.py
bzrlib/bzrdir.py
bzrlib/help_topics/__init__.py
bzrlib/repofmt/groupcompress_repo.py
bzrlib/repository.py
bzrlib/smart/bzrdir.py
bzrlib/smart/request.py
bzrlib/tests/blackbox/test_init.py
bzrlib/tests/test_remote.py
bzrlib/tests/test_smart.py
------------------------------------------------------------
revno: 3815.775.3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-06-11 14:10:15 +0100
message:
(jml) Merge in changes from trunk that belong in 1.16rc1.
------------------------------------------------------------
revno: 3815.775.4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-06-11 16:21:59 +0100
message:
(Michael Ernst) Clarify wording for branch (and copy)
modified:
bzrlib/builtins.py
bzrlib/help_topics/__init__.py
------------------------------------------------------------
revno: 3815.778.1
committer: mernst at csail.mit.edu
branch nick: branch-copy
timestamp: Wed 2009-06-10 23:54:33 -0700
message:
branch documentation: clarify English word "copy"
modified:
bzrlib/builtins.py
bzrlib/help_topics/__init__.py
------------------------------------------------------------
revno: 3815.775.5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-12 00:43:13 +0100
message:
(Jelmer) Fix bzr version required by development7 format.
modified:
bzrlib/repofmt/groupcompress_repo.py
bzrlib/repository.py
------------------------------------------------------------
revno: 3815.779.1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Fri 2009-06-05 14:20:47 +0200
message:
Mention bzr 1.16 in the dev7 format description.
modified:
bzrlib/repofmt/groupcompress_repo.py
bzrlib/repository.py
------------------------------------------------------------
revno: 3815.775.6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-12 02:11:00 +0100
message:
(mbp) add 2a format
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/repofmt/groupcompress_repo.py
bzrlib/repository.py
bzrlib/tests/blackbox/test_init.py
------------------------------------------------------------
revno: 3815.780.1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 385103-format-name
timestamp: Thu 2009-06-11 14:04:14 +1000
message:
Add 2a format
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/repofmt/groupcompress_repo.py
bzrlib/repository.py
bzrlib/tests/blackbox/test_init.py
------------------------------------------------------------
revno: 3815.780.2
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 385103-format-name
timestamp: Thu 2009-06-11 14:08:08 +1000
message:
Format 2a should not be hidden
modified:
bzrlib/bzrdir.py
------------------------------------------------------------
revno: 3815.780.3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 385103-format-name
timestamp: Thu 2009-06-11 14:08:20 +1000
message:
Warn that upgrading to 2a may take some time
modified:
NEWS
------------------------------------------------------------
revno: 3815.780.4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 385103-format-name
timestamp: Thu 2009-06-11 15:07:41 +1000
message:
Tweak news about 2a format
modified:
NEWS
------------------------------------------------------------
revno: 3815.780.5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 385103-format-name
timestamp: Thu 2009-06-11 17:16:52 +1000
message:
Mark 2a experimental and tweak its help per lifeless's review
modified:
bzrlib/bzrdir.py
------------------------------------------------------------
revno: 3815.780.6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 385103-format-name
timestamp: Fri 2009-06-12 10:12:11 +1000
message:
Stupid typo fix
modified:
bzrlib/bzrdir.py
------------------------------------------------------------
revno: 3815.775.7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-12 04:44:12 +0100
message:
(andrew) Rename BzrDirFormat.initialize_ex verb to
BzrDirFormat.initialize_ex_1.16.
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/smart/bzrdir.py
bzrlib/smart/request.py
bzrlib/tests/test_remote.py
bzrlib/tests/test_smart.py
------------------------------------------------------------
revno: 3815.781.1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: rename-init_ex-verb
timestamp: Fri 2009-06-12 11:48:43 +1000
message:
Rename BzrDirFormat.initialize_ex verb to BzrDirFormat.initialize_ex_1.16.
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/smart/bzrdir.py
bzrlib/smart/request.py
bzrlib/tests/test_remote.py
bzrlib/tests/test_smart.py
------------------------------------------------------------
revno: 3815.684.75
committer: Jonathan Lange <jml at canonical.com>
branch nick: prepare-1.16
timestamp: Fri 2009-06-12 13:51:27 +1000
message:
Merge in overnight changes to trunk.
modified:
NEWS
bzrlib/builtins.py
bzrlib/bzrdir.py
bzrlib/help_topics/__init__.py
bzrlib/repofmt/groupcompress_repo.py
bzrlib/repository.py
bzrlib/smart/bzrdir.py
bzrlib/smart/request.py
bzrlib/tests/blackbox/test_init.py
bzrlib/tests/test_remote.py
bzrlib/tests/test_smart.py
------------------------------------------------------------
revno: 3815.777.3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Fri 2009-06-12 06:49:23 +0100
message:
(jml) Prepare 1.16rc1.
modified:
NEWS
------------------------------------------------------------
revno: 3815.684.76
committer: Jonathan Lange <jml at canonical.com>
branch nick: prepare-1.16
timestamp: Fri 2009-06-12 14:16:21 +1000
message:
Release 1.16rc1.
modified:
NEWS
------------------------------------------------------------
revno: 3815.777.4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Thu 2009-06-18 09:49:00 +0100
message:
(andrew) Cherrypick fix for bug 388675 (landed in bzr.dev r4458)
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
------------------------------------------------------------
revno: 3815.782.1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr-1.16
timestamp: Thu 2009-06-18 13:45:13 +1000
message:
Cherry-pick fix for #388675.
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
------------------------------------------------------------
revno: 3815.777.5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.16
timestamp: Thu 2009-06-18 11:19:56 +0100
message:
(jelmer) Fix the nested tree flag check so upgrade from dev formats
works. Bug 388727.
modified:
NEWS
bzrlib/repofmt/groupcompress_repo.py
------------------------------------------------------------
revno: 3815.779.2
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Fri 2009-06-05 14:21:04 +0200
message:
During groupcompress repository upgrades, only require subtree support in the target if the source had subtree support.
modified:
bzrlib/repofmt/groupcompress_repo.py
------------------------------------------------------------
revno: 3815.783.1
committer: Jonathan Lange <jml at canonical.com>
branch nick: fix-subtree-check
timestamp: Thu 2009-06-18 17:50:35 +1000
message:
Merge in jelmer's subtree check fix.
modified:
bzrlib/repofmt/groupcompress_repo.py
------------------------------------------------------------
revno: 3815.783.2
committer: Jonathan Lange <jml at canonical.com>
branch nick: fix-subtree-check
timestamp: Thu 2009-06-18 18:58:01 +1000
message:
Bring in recent 1.16 changes.
modified:
NEWS
bzrlib/bzrdir.py
bzrlib/tests/bzrdir_implementations/test_bzrdir.py
------------------------------------------------------------
revno: 3815.783.3
committer: Jonathan Lange <jml at canonical.com>
branch nick: fix-subtree-check
timestamp: Thu 2009-06-18 19:06:38 +1000
message:
Add a NEWS entry for jelmer's fix.
modified:
NEWS
------------------------------------------------------------
revno: 3815.777.6
committer: Jonathan Lange <jml at canonical.com>
branch nick: prepare-1.16
timestamp: Thu 2009-06-18 20:29:00 +1000
message:
Release 1.16.
modified:
NEWS
bzrlib/__init__.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2009-06-11 12:43:59 +0000
+++ b/NEWS 2009-06-18 10:29:00 +0000
@@ -6,13 +6,32 @@
.. contents:: List of Releases
:depth: 1
-bzr 1.16rc1 2009-06-11
-######################
-
-This release has many improvements to the "brisbane-core" format, taking the
-shape of a new '--development7-rich-root' format which uses bencode rather
-than XML. Many operations are now much faster on huge projects. The usual bevy
-of bug fixes, tweaks and improvements.
+bzr 1.16 "It's yesterday in California" 2009-06-18
+##################################################
+:Codename: yesterday-in-california
+:1.16rc1: 2009-06-11
+:1.16: 2009-06-18
+
+This version of Bazaar contains the beta release of the new ``2a`` repository
+format, suitable for testing by fearless, advanced users. This format or an
+updated version of it will become the default format in Bazaar 2.0. Please
+read the NEWS entry before even thinking about upgrading to the new format.
+
+Also included are speedups for many operations on huge projects, a bug fix for
+pushing stacked new stacked branches to smart servers and the usual bevy of
+bug fixes and improvements.
+
+
+Changes from 1.16rc1 to 1.16final
+*********************************
+
+* Fix the nested tree flag check so that upgrade from development formats to
+ 2a can work correctly.
+ (Jelmer Vernooij, #388727)
+
+* Automatic format upgrades triggered by default stacking policies on a
+ 1.16rc1 (or later) smart server work again.
+ (Andrew Bennetts, #388675)
Compatibility Breaks
@@ -26,6 +45,25 @@
New Features
************
+* A new repository format ``2a`` has been added. This is a beta release
+ of the the brisbane-core (aka group-compress) project. This format now
+ suitable for wider testing by advanced users willing to deal with some
+ bugs. We would appreciate test reports, either positive or negative.
+ Format 2a is substantially smaller and faster for many operations on
+ many trees. This format or an updated version will become the default
+ in bzr 2.0.
+
+ This is a rich-root format, so this repository format can be used with
+ bzr-svn. Bazaar branches in previous non-rich-root formats can be
+ converted (including by merge, push and pull) to format 2a, but not vice
+ versa. We recommend upgrading previous development formats to 2a.
+
+ Upgrading to this format can take considerable time because it expands
+ and more concisely repacks the full history.
+
+ If you use stacked branches, you must upgrade the stacked branches
+ before the stacked-on branches. (See <https://bugs.launchpad.net/bugs/374735>)
+
* ``--development7-rich-root`` is a new dev format, similar to ``--dev6``
but using a Revision serializer using bencode rather than XML.
(Jelmer Vernooij, John Arbash Meinel)
@@ -100,6 +138,15 @@
* Fix rule handling so that eol is optional, not mandatory.
(Ian Clatworthy, #379370)
+* Pushing a new stacked branch to a 1.15 smart server was broken due to a
+ bug in the ``BzrDirFormat.initialize_ex`` smart verb. This is fixed in
+ 1.16, but required changes to the network protocol, so the
+ ``BzrDirFormat.initialize_ex`` verb has been removed and replaced with a
+ corrected ``BzrDirFormat.initialize_ex_1.16`` verb. 1.15 clients will
+ still work with a 1.16 server as they will fallback to slower (and
+ bug-free) methods.
+ (Jonathan Lange, Robert Collins, Andrew Bennetts, #385132)
+
* Reconcile can now deal with text revisions that originated in revisions
that are ghosts. (Jelmer Vernooij, #336749)
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2009-06-11 12:18:48 +0000
+++ b/bzrlib/__init__.py 2009-06-18 10:29:00 +0000
@@ -50,7 +50,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (1, 16, 0, 'candidate', 1)
+version_info = (1, 16, 0, 'final', 0)
# API compatibility version: bzrlib is currently API compatible with 1.15.
api_minimum_version = (1, 15, 0)
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2009-06-11 04:23:53 +0000
+++ b/bzrlib/builtins.py 2009-06-11 06:54:33 +0000
@@ -1078,7 +1078,7 @@
class cmd_branch(Command):
- """Create a new copy of a branch.
+ """Create a new branch that is a copy of an existing branch.
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2009-06-11 11:02:53 +0000
+++ b/bzrlib/bzrdir.py 2009-06-18 03:45:13 +0000
@@ -2358,7 +2358,8 @@
def set_branch_format(self, format):
self._branch_format = format
- def require_stacking(self, stack_on=None, possible_transports=None):
+ def require_stacking(self, stack_on=None, possible_transports=None,
+ _skip_repo=False):
"""We have a request to stack, try to ensure the formats support it.
:param stack_on: If supplied, it is the URL to a branch that we want to
@@ -2402,7 +2403,8 @@
target[:] = [target_branch, True, False]
return target
- if not (self.repository_format.supports_external_lookups):
+ if (not _skip_repo and
+ not self.repository_format.supports_external_lookups):
# We need to upgrade the Repository.
target_branch, _, do_upgrade = get_target_branch()
if target_branch is None:
@@ -3175,7 +3177,7 @@
if not do_vfs:
client = _SmartClient(client_medium)
path = client.remote_path_from_transport(transport)
- if client_medium._is_remote_before((1, 15)):
+ if client_medium._is_remote_before((1, 16)):
do_vfs = True
if do_vfs:
# TODO: lookup the local format from a server hint.
@@ -3215,9 +3217,10 @@
self._network_name = \
BzrDirFormat.get_default_format().network_name()
try:
- response = client.call('BzrDirFormat.initialize_ex',
+ response = client.call('BzrDirFormat.initialize_ex_1.16',
self.network_name(), path, *args)
except errors.UnknownSmartMethod:
+ client._medium._remember_remote_is_before((1,16))
local_dir_format = BzrDirMetaFormat1()
self._supply_sub_formats_to(local_dir_format)
return local_dir_format.initialize_on_transport_ex(transport,
@@ -3267,6 +3270,10 @@
else:
remote_repo = None
policy = None
+ if require_stacking:
+ # The repo has already been created, but we need to make sure that
+ # we'll make a stackable branch.
+ bzrdir._format.require_stacking(_skip_repo=True)
return remote_repo, bzrdir, require_stacking, policy
def _open(self, transport):
@@ -3831,6 +3838,18 @@
experimental=True,
)
+format_registry.register_metadir('2a',
+ 'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
+ help='First format for bzr 2.0 series.\n'
+ 'Uses group-compress storage.\n'
+ 'Provides rich roots which are a one-way transition.\n',
+ # 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
+ # 'rich roots. Supported by bzr 1.16 and later.',
+ branch_format='bzrlib.branch.BzrBranchFormat7',
+ tree_format='bzrlib.workingtree.WorkingTreeFormat6',
+ experimental=True,
+ )
+
# The following format should be an alias for the rich root equivalent
# of the default format
format_registry.register_metadir('default-rich-root',
=== modified file 'bzrlib/help_topics/__init__.py'
--- a/bzrlib/help_topics/__init__.py 2009-04-02 04:12:11 +0000
+++ b/bzrlib/help_topics/__init__.py 2009-06-11 06:54:33 +0000
@@ -489,7 +489,7 @@
Related commands::
init Change a directory into a versioned branch.
- branch Create a new copy of a branch.
+ branch Create a new branch that is a copy of an existing branch.
merge Perform a three-way merge.
"""
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py 2009-06-18 07:50:35 +0000
@@ -1044,7 +1044,8 @@
if not target_format.rich_root_data:
raise errors.BadConversionTarget(
'Does not support rich root data.', target_format)
- if not getattr(target_format, 'supports_tree_reference', False):
+ if (self.supports_tree_reference and
+ not getattr(target_format, 'supports_tree_reference', False)):
raise errors.BadConversionTarget(
'Does not support nested trees', target_format)
@@ -1066,6 +1067,24 @@
def get_format_string(self):
"""See RepositoryFormat.get_format_string()."""
return ('Bazaar development format - chk repository with bencode '
- 'revision serialization (needs bzr.dev from 1.15)\n')
-
-
+ 'revision serialization (needs bzr.dev from 1.16)\n')
+
+
+class RepositoryFormat2a(RepositoryFormatCHK2):
+ """A CHK repository that uses the bencode revision serializer.
+
+ This is the same as RepositoryFormatCHK2 but with a public name.
+ """
+
+ _serializer = chk_serializer.chk_bencode_serializer
+
+ def _get_matching_bzrdir(self):
+ return bzrdir.format_registry.make_bzrdir('2a')
+
+ def _ignore_setting_bzrdir(self, format):
+ pass
+
+ _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)
+
+ def get_format_string(self):
+ return ('Bazaar repository format 2a (needs bzr 1.16 or later)\n')
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/repository.py 2009-06-12 01:11:00 +0000
@@ -3062,10 +3062,15 @@
format_registry.register_lazy(
'Bazaar development format - chk repository with bencode revision '
- 'serialization (needs bzr.dev from 1.15)\n',
+ 'serialization (needs bzr.dev from 1.16)\n',
'bzrlib.repofmt.groupcompress_repo',
'RepositoryFormatCHK2',
)
+format_registry.register_lazy(
+ 'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
+ 'bzrlib.repofmt.groupcompress_repo',
+ 'RepositoryFormat2a',
+ )
class InterRepository(InterObject):
=== modified file 'bzrlib/smart/bzrdir.py'
--- a/bzrlib/smart/bzrdir.py 2009-06-11 10:11:34 +0000
+++ b/bzrlib/smart/bzrdir.py 2009-06-12 01:48:43 +0000
@@ -354,7 +354,10 @@
def do(self, bzrdir_network_name, path, use_existing_dir, create_prefix,
force_new_repo, stacked_on, stack_on_pwd, repo_format_name,
make_working_trees, shared_repo):
- """Initialize a bzrdir at path as per BzrDirFormat.initialize_ex
+ """Initialize a bzrdir at path as per
+ BzrDirFormat.initialize_on_transport_ex.
+
+ New in 1.16. (Replaces BzrDirFormat.initialize_ex verb from 1.15).
:return: return SuccessfulSmartServerResponse((repo_path, rich_root,
tree_ref, external_lookup, repo_network_name,
=== modified file 'bzrlib/smart/request.py'
--- a/bzrlib/smart/request.py 2009-04-24 05:08:51 +0000
+++ b/bzrlib/smart/request.py 2009-06-12 01:48:43 +0000
@@ -492,7 +492,7 @@
'BzrDirFormat.initialize', 'bzrlib.smart.bzrdir',
'SmartServerRequestInitializeBzrDir')
request_handlers.register_lazy(
- 'BzrDirFormat.initialize_ex', 'bzrlib.smart.bzrdir',
+ 'BzrDirFormat.initialize_ex_1.16', 'bzrlib.smart.bzrdir',
'SmartServerRequestBzrDirInitializeEx')
request_handlers.register_lazy(
'BzrDir.open', 'bzrlib.smart.bzrdir', 'SmartServerRequestOpenBzrDir')
=== modified file 'bzrlib/tests/blackbox/test_init.py'
--- a/bzrlib/tests/blackbox/test_init.py 2009-03-23 14:59:43 +0000
+++ b/bzrlib/tests/blackbox/test_init.py 2009-06-11 04:04:14 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006, 2007 Canonical Ltd
+# Copyright (C) 2006, 2007, 2009 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -49,6 +49,13 @@
out)
self.assertEqual('', err)
+ def test_init_format_2a(self):
+ """Smoke test for constructing a format 2a repoistory."""
+ out, err = self.run_bzr('init --format=2a')
+ self.assertEqual("""Created a standalone tree (format: 2a)\n""",
+ out)
+ self.assertEqual('', err)
+
def test_init_at_repository_root(self):
# bzr init at the root of a repository should create a branch
# and working tree even when creation of working trees is disabled.
=== modified file 'bzrlib/tests/bzrdir_implementations/test_bzrdir.py'
--- a/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2009-06-11 03:15:57 +0000
+++ b/bzrlib/tests/bzrdir_implementations/test_bzrdir.py 2009-06-18 03:45:13 +0000
@@ -1275,6 +1275,9 @@
fallback_repo = repo._fallback_repositories[0]
self.assertEqual(
stack_on.base, fallback_repo.bzrdir.root_transport.base)
+ # The bzrdir creates a branch in stacking-capable format.
+ new_branch = control.create_branch()
+ self.assertTrue(new_branch._format.supports_stacking())
def test_format_initialize_on_transport_ex_repo_fmt_name_None(self):
t = self.get_transport('dir')
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2009-06-10 03:56:49 +0000
+++ b/bzrlib/tests/test_remote.py 2009-06-12 01:48:43 +0000
@@ -750,7 +750,7 @@
transport = self.get_transport()
client = FakeClient(transport.base)
client.add_expected_call(
- 'BzrDirFormat.initialize_ex',
+ 'BzrDirFormat.initialize_ex_1.16',
(default_format_name, 'path', 'False', 'False', 'False', '',
'', '', '', 'False'),
'success',
@@ -772,7 +772,7 @@
transport = self.get_transport()
client = FakeClient(transport.base)
client.add_expected_call(
- 'BzrDirFormat.initialize_ex',
+ 'BzrDirFormat.initialize_ex_1.16',
(default_format_name, 'path', 'False', 'False', 'False', '',
'', '', '', 'False'),
'error',
=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py 2009-06-11 07:10:44 +0000
+++ b/bzrlib/tests/test_smart.py 2009-06-12 01:48:43 +0000
@@ -351,7 +351,7 @@
class TestSmartServerRequestBzrDirInitializeEx(tests.TestCaseWithMemoryTransport):
- """Basic tests for BzrDir.initialize_ex in the smart server.
+ """Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
The main unit tests in test_bzrdir exercise the API comprehensively.
"""
@@ -1560,7 +1560,7 @@
smart.bzrdir.SmartServerRequestFindRepositoryV2)
self.assertHandlerEqual('BzrDirFormat.initialize',
smart.bzrdir.SmartServerRequestInitializeBzrDir)
- self.assertHandlerEqual('BzrDirFormat.initialize_ex',
+ self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
smart.bzrdir.SmartServerRequestBzrDirInitializeEx)
self.assertHandlerEqual('BzrDir.cloning_metadir',
smart.bzrdir.SmartServerBzrDirRequestCloningMetaDir)
=== modified file 'debian/changelog'
--- a/debian/changelog 2009-06-18 11:25:21 +0000
+++ b/debian/changelog 2009-06-18 12:51:54 +0000
@@ -1,4 +1,4 @@
-bzr (1.16~rc1-1) unstable; urgency=low
+bzr (1.16-1) unstable; urgency=low
* New upstream release.
* Add python-pyrex to build-deps to ensure C extensions are always build.
More information about the Pkg-bazaar-commits
mailing list