~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_reconfigure.py

• browse files at revision 4316.1.5
• compare with another revision
• download diff
• download tarball
• view history from revision 4316.1.5

• reverse the comparison (4316.1.5 to 5452)
• stop comparing with revision 5452

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_reconfigure.py

1

 

# Copyright (C) 2007, 2009 Canonical Ltd

 

1

# Copyright (C) 2007 Canonical Ltd

2

2

#

3

3

# This program is free software; you can redistribute it and/or modify

4

4

# it under the terms of the GNU General Public License as published by

20

20

    tests,

21

21

    workingtree,

22

22

    )

23

 

from bzrlib.branchbuilder import BranchBuilder

24

23

 

25

24

 

26

25

class TestReconfigure(tests.TestCaseWithTransport):

59

58

        checkout = branch.create_checkout('checkout', lightweight=True)

60

59

        self.run_bzr('reconfigure --checkout checkout')

61

60

 

62

 

    def test_lightweight_checkout_to_tree(self):

63

 

        branch = self.make_branch('branch')

64

 

        checkout = branch.create_checkout('checkout', lightweight=True)

65

 

        self.run_bzr('reconfigure --tree checkout')

66

 

 

67

61

    def test_no_args(self):

68

62

        branch = self.make_branch('branch')

69

63

        self.run_bzr_error(['No target configuration specified'],

133

127

            working_dir='repo/branch')

134

128

        self.failUnlessExists('repo/branch/foo')

135

129

        tree = workingtree.WorkingTree.open('repo/branch')

136

 

 

137

 

    def test_shared_format_to_standalone(self, format=None):

138

 

        repo = self.make_repository('repo', shared=True, format=format)

139

 

        branch = bzrdir.BzrDir.create_branch_convenience('repo/tree')

140

 

        self.assertNotEqual(branch.bzrdir.root_transport.base,

141

 

            branch.repository.bzrdir.root_transport.base)

142

 

        tree = workingtree.WorkingTree.open('repo/tree')

143

 

        self.build_tree_contents([('repo/tree/file', 'foo\n')]);

144

 

        tree.add(['file'])

145

 

        tree.commit('added file')

146

 

        self.run_bzr('reconfigure --standalone', working_dir='repo/tree')

147

 

        tree = workingtree.WorkingTree.open('repo/tree')

148

 

        self.build_tree_contents([('repo/tree/file', 'bar\n')]);

149

 

        self.check_file_contents('repo/tree/file', 'bar\n')

150

 

        self.run_bzr('revert', working_dir='repo/tree')

151

 

        self.check_file_contents('repo/tree/file', 'foo\n')

152

 

        self.assertEqual(tree.bzrdir.root_transport.base,

153

 

            tree.branch.repository.bzrdir.root_transport.base)

154

 

 

155

 

    def test_shared_knit_to_standalone(self):

156

 

        self.test_shared_format_to_standalone('knit')

157

 

 

158

 

    def test_shared_pack092_to_standalone(self):

159

 

        self.test_shared_format_to_standalone('pack-0.92')

160

 

 

161

 

    def test_shared_rich_root_pack_to_standalone(self):

162

 

        self.test_shared_format_to_standalone('rich-root-pack')

163

 

 

164

 

    def test_lightweight_format_checkout_to_tree(self, format=None):

165

 

        branch = self.make_branch('branch', format=format)

166

 

        checkout = branch.create_checkout('checkout', lightweight=True)

167

 

        tree = workingtree.WorkingTree.open('checkout')

168

 

        self.build_tree_contents([('checkout/file', 'foo\n')]);

169

 

        tree.add(['file'])

170

 

        tree.commit('added file')

171

 

        self.run_bzr('reconfigure --tree', working_dir='checkout')

172

 

        tree = workingtree.WorkingTree.open('checkout')

173

 

        self.build_tree_contents([('checkout/file', 'bar\n')]);

174

 

        self.check_file_contents('checkout/file', 'bar\n')

175

 

        self.run_bzr('revert', working_dir='checkout')

176

 

        self.check_file_contents('checkout/file', 'foo\n')

177

 

 

178

 

    def test_lightweight_knit_checkout_to_tree(self, format=None):

179

 

        self.test_lightweight_format_checkout_to_tree('knit')

180

 

 

181

 

    def test_lightweight_pack092_checkout_to_tree(self, format=None):

182

 

        self.test_lightweight_format_checkout_to_tree('pack-0.92')

183

 

 

184

 

    def test_lightweight_rich_root_pack_checkout_to_tree(self, format=None):

185

 

        self.test_lightweight_format_checkout_to_tree('rich-root-pack')

186

 

 

187

 

 

188

 

class TestReconfigureStacking(tests.TestCaseWithTransport):

189

 

 

190

 

    def test_reconfigure_stacking(self):

191

 

        """Test a fairly realistic scenario for stacking:

192

 

 

193

 

         * make a branch with some history

194

 

         * branch it

195

 

         * make the second branch stacked on the first

196

 

         * commit in the second

197

 

         * then make the second unstacked, so it has to fill in history from

198

 

           the original fallback lying underneath its original content

199

 

 

200

 

        See discussion in <https://bugs.launchpad.net/bzr/+bug/391411>

201

 

        """

202

 

        # there are also per_branch tests that exercise remote operation etc

203

 

        tree_1 = self.make_branch_and_tree('b1', format='2a')

204

 

        self.build_tree(['b1/foo'])

205

 

        tree_1.add(['foo'])

206

 

        tree_1.commit('add foo')

207

 

        branch_1 = tree_1.branch

208

 

        # now branch and commit again

209

 

        bzrdir_2 = tree_1.bzrdir.sprout('b2')

210

 

        tree_2 = bzrdir_2.open_workingtree()

211

 

        branch_2 = tree_2.branch

212

 

        # now reconfigure to be stacked

213

 

        out, err = self.run_bzr('reconfigure --stacked-on b1 b2')

214

 

        self.assertContainsRe(out,

215

 

            '^.*/b2/ is now stacked on ../b1\n$')

216

 

        self.assertEquals('', err)

217

 

        # can also give the absolute URL of the branch, and it gets stored 

218

 

        # as a relative path if possible

219

 

        out, err = self.run_bzr('reconfigure --stacked-on %s b2'

220

 

            % (self.get_url('b1'),))

221

 

        self.assertContainsRe(out,

222

 

            '^.*/b2/ is now stacked on ../b1\n$')

223

 

        self.assertEquals('', err)

224

 

        # It should be given a relative URL to the destination, if possible,

225

 

        # because that's most likely to work across different transports

226

 

        self.assertEquals(branch_2.get_stacked_on_url(),

227

 

            '../b1')

228

 

        # commit, and it should be stored into b2's repo

229

 

        self.build_tree_contents([('foo', 'new foo')])

230

 

        tree_2.commit('update foo')

231

 

        # Now turn it off again

232

 

        out, err = self.run_bzr('reconfigure --unstacked b2')

233

 

        self.assertContainsRe(out,

234

 

            '^.*/b2/ is now not stacked\n$')

235

 

        self.assertEquals('', err)

236

 

        self.assertRaises(errors.NotStacked,

237

 

            branch_2.get_stacked_on_url)

238

 

 

239

 

    # XXX: Needs a test for reconfiguring stacking and shape at the same time;

240

 

    # no branch at location; stacked-on is not a branch; quiet mode.

241

 

    # -- mbp 20090706

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1