[MERGE] Allow changing --[no-]trees with reconfigure (bug 145033)
Matthew D. Fuller
fullermd at over-yonder.net
Fri Jan 9 02:47:19 GMT 2009
On Fri, Jan 09, 2009 at 10:58:23AM +1000 I heard the voice of
Ian Clatworthy, and lo! it spake thus:
>
> I think you need a test covering "reconfiguration not supported"
> when used in a non-shared repo.
>
> Please add an item to NEWS as well, mentioning the bug and taking
> the credit for fixing it.
Added to blackbox tests and done.
One thing that came to mind in doing that was that this WILL do its
thing if run on a branch in a shared repo (e.g., will change the
repo's setting); it doesn't only work when in/pointed at the repo base
itself. I don't know if that could be construed as a problem, but I
don't think it is.
--
Matthew Fuller (MF4839) | fullermd at over-yonder.net
Systems/Network Administrator | http://www.over-yonder.net/~fullermd/
On the Internet, nobody can hear you scream.
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: fullermd at over-yonder.net-20090109024355-\
# v3z4gp203of33r7s
# target_branch: file:///home/fullermd/src/bzr/bzr.dev/
# testament_sha1: 2df79ef1df984767be1c9610376d6e4833f7f2d7
# timestamp: 2009-01-08 20:44:16 -0600
# base_revision_id: pqm at pqm.ubuntu.com-20081229142916-z08eu2alga2acrh6
#
# Begin patch
=== modified file 'NEWS'
--- NEWS 2008-12-29 13:51:19 +0000
+++ NEWS 2009-01-09 02:43:55 +0000
@@ -34,6 +34,10 @@
* ``bzr revision-info`` now supports a -d option to specify an
alternative branch. (Michael Hudson)
+ * ``bzr reconfigure`` now supports --with-trees and --with-no-trees
+ options to change the default tree-creation policy of shared
+ repositories. (Matthew Fuller, #145033)
+
BUG FIXES:
* Fix a problem with CIFS client/server lag on windows colliding with
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py 2008-12-23 22:34:38 +0000
+++ bzrlib/builtins.py 2009-01-08 08:07:25 +0000
@@ -4666,7 +4666,11 @@
' checkout (with no local history).',
standalone='Reconfigure to be a standalone branch '
'(i.e. stop using shared repository).',
- use_shared='Reconfigure to use a shared repository.'),
+ use_shared='Reconfigure to use a shared repository.',
+ with_trees='Reconfigure repository to create '
+ 'working trees on branches by default',
+ with_no_trees='Reconfigure repository to not create '
+ 'working trees on branches by default'),
Option('bind-to', help='Branch to bind checkout to.',
type=str),
Option('force',
@@ -4692,6 +4696,12 @@
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
elif target_type == 'standalone':
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
+ elif target_type == 'with-trees':
+ reconfiguration = reconfigure.Reconfigure.set_repository_trees(
+ directory, True)
+ elif target_type == 'with-no-trees':
+ reconfiguration = reconfigure.Reconfigure.set_repository_trees(
+ directory, False)
reconfiguration.apply(force)
=== modified file 'bzrlib/errors.py'
--- bzrlib/errors.py 2008-12-19 16:48:04 +0000
+++ bzrlib/errors.py 2009-01-08 08:06:33 +0000
@@ -2744,6 +2744,18 @@
_fmt = "'%(display_url)s' is already standalone."
+class AlreadyWithTrees(BzrDirError):
+
+ _fmt = "Shared repository '%(display_url)s' already creates " \
+ "working trees."
+
+
+class AlreadyWithNoTrees(BzrDirError):
+
+ _fmt = "Shared repository '%(display_url)s' already doesn't create " \
+ "working trees."
+
+
class ReconfigurationNotSupported(BzrDirError):
_fmt = "Requested reconfiguration of '%(display_url)s' is not supported."
=== modified file 'bzrlib/reconfigure.py'
--- bzrlib/reconfigure.py 2008-04-24 04:58:42 +0000
+++ bzrlib/reconfigure.py 2009-01-08 08:07:00 +0000
@@ -24,9 +24,10 @@
class Reconfigure(object):
- def __init__(self, bzrdir, new_bound_location=None):
+ def __init__(self, bzrdir, new_bound_location=None, with_trees=None):
self.bzrdir = bzrdir
self.new_bound_location = new_bound_location
+ self.with_trees = with_trees
try:
self.repository = self.bzrdir.find_repository()
except errors.NoRepositoryPresent:
@@ -62,6 +63,8 @@
self._create_tree = False
self._create_repository = False
self._destroy_repository = False
+ self._set_with_trees = False
+ self._set_with_no_trees = False
@staticmethod
def to_branch(bzrdir):
@@ -140,14 +143,31 @@
raise errors.AlreadyStandalone(bzrdir)
return reconfiguration
+ @classmethod
+ def set_repository_trees(klass, bzrdir, with_trees):
+ """Convert a repository branch into a standalone branch"""
+ reconfiguration = klass(bzrdir, with_trees=with_trees)
+ reconfiguration._plan_changes(want_tree=False, want_branch=False,
+ want_bound=False, want_reference=False,
+ want_shared_repository=True)
+ if not reconfiguration.changes_planned():
+ if with_trees:
+ raise errors.AlreadyWithTrees(bzrdir)
+ else:
+ raise errors.AlreadyWithNoTrees(bzrdir)
+ return reconfiguration
+
def _plan_changes(self, want_tree, want_branch, want_bound,
- want_reference):
+ want_reference, want_shared_repository=False):
"""Determine which changes are needed to assume the configuration"""
- if not want_branch and not want_reference:
+ if not want_branch and not want_reference and \
+ not want_shared_repository:
raise errors.ReconfigurationNotSupported(self.bzrdir)
if want_branch and want_reference:
raise errors.ReconfigurationNotSupported(self.bzrdir)
if self.repository is None:
+ if want_shared_repository:
+ raise errors.ReconfigurationNotSupported(self.bzrdir)
if not want_reference:
self._create_repository = True
else:
@@ -155,6 +175,16 @@
== self.bzrdir.root_transport.base):
if not self.repository.is_shared():
self._destroy_repository = True
+ if want_shared_repository:
+ if not self.repository.is_shared():
+ raise errors.ReconfigurationNotSupported(self.bzrdir)
+ else:
+ if self.with_trees is True and \
+ not self.repository.make_working_trees():
+ self._set_with_trees = True
+ elif self.with_trees is False and \
+ self.repository.make_working_trees():
+ self._set_with_no_trees = True
if self.referenced_branch is None:
if want_reference:
self._create_reference = True
@@ -195,7 +225,8 @@
return (self._unbind or self._bind or self._destroy_tree
or self._create_tree or self._destroy_reference
or self._create_branch or self._create_repository
- or self._create_reference or self._destroy_repository)
+ or self._create_reference or self._destroy_repository
+ or self._set_with_trees or self._set_with_no_trees)
def _check(self):
"""Raise if reconfiguration would destroy local changes"""
@@ -302,3 +333,7 @@
local_branch.bind(branch.Branch.open(bind_location))
if self._destroy_repository:
self.bzrdir.destroy_repository()
+ if self._set_with_trees:
+ self.repository.set_make_working_trees(True)
+ if self._set_with_no_trees:
+ self.repository.set_make_working_trees(False)
=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py'
--- bzrlib/tests/blackbox/test_reconfigure.py 2008-04-12 05:48:07 +0000
+++ bzrlib/tests/blackbox/test_reconfigure.py 2009-01-09 02:41:44 +0000
@@ -86,3 +86,33 @@
tree = workingtree.WorkingTree.open('repo/tree')
self.assertEqual(tree.bzrdir.root_transport.base,
tree.branch.repository.bzrdir.root_transport.base)
+
+ def test_make_with_trees(self):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(False)
+ self.run_bzr('reconfigure --with-trees', working_dir='repo')
+ self.assertIs(True, repo.make_working_trees())
+
+ def test_make_with_trees_already_trees(self):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(True)
+ self.run_bzr_error([" already creates working trees"],
+ 'reconfigure --with-trees repo')
+
+ def test_make_without_trees(self):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(True)
+ self.run_bzr('reconfigure --with-no-trees', working_dir='repo')
+ self.assertIs(False, repo.make_working_trees())
+
+ def test_make_without_trees_already_no_trees(self):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(False)
+ self.run_bzr_error([" already doesn't create working trees"],
+ 'reconfigure --with-no-trees repo')
+
+ def test_make_with_trees_nonshared_repo(self):
+ branch = self.make_branch('branch')
+ self.run_bzr_error(
+ ["Requested reconfiguration of '.*' is not supported"],
+ 'reconfigure --with-trees branch')
=== modified file 'bzrlib/tests/test_reconfigure.py'
--- bzrlib/tests/test_reconfigure.py 2008-04-25 22:16:00 +0000
+++ bzrlib/tests/test_reconfigure.py 2009-01-08 08:13:29 +0000
@@ -377,3 +377,33 @@
def test_unsynced_branch_to_lightweight_checkout_forced(self):
reconfiguration = self.make_unsynced_branch_reconfiguration()
reconfiguration.apply(force=True)
+
+ def make_repository_with_without_trees(self, with_trees):
+ repo = self.make_repository('repo', shared=True)
+ repo.set_make_working_trees(with_trees)
+ return repo
+
+ def test_make_with_trees(self):
+ repo = self.make_repository_with_without_trees(False)
+ reconfiguration = reconfigure.Reconfigure.set_repository_trees(
+ repo.bzrdir, True)
+ reconfiguration.apply()
+ self.assertIs(True, repo.make_working_trees())
+
+ def test_make_without_trees(self):
+ repo = self.make_repository_with_without_trees(True)
+ reconfiguration = reconfigure.Reconfigure.set_repository_trees(
+ repo.bzrdir, False)
+ reconfiguration.apply()
+ self.assertIs(False, repo.make_working_trees())
+
+ def test_make_with_trees_already_with_trees(self):
+ repo = self.make_repository_with_without_trees(True)
+ self.assertRaises(errors.AlreadyWithTrees,
+ reconfigure.Reconfigure.set_repository_trees, repo.bzrdir, True)
+
+ def test_make_without_trees_already_no_trees(self):
+ repo = self.make_repository_with_without_trees(False)
+ self.assertRaises(errors.AlreadyWithNoTrees,
+ reconfigure.Reconfigure.set_repository_trees, repo.bzrdir, False)
+
# Begin bundle
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
More information about the bazaar
mailing list