1
# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
1
# Copyright (C) 2006-2010 Canonical Ltd
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
27
27
revision as _mod_revision,
29
29
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
30
from bzrlib.tests.blackbox import ExternalBase
30
from bzrlib.tests import TestCaseWithTransport
31
31
from bzrlib.tests import (
35
36
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
36
37
from bzrlib.urlutils import local_path_to_url, strip_trailing_slash
37
38
from bzrlib.workingtree import WorkingTree
40
class TestBranch(ExternalBase):
41
class TestBranch(TestCaseWithTransport):
42
43
def example_branch(self, path='.'):
43
44
tree = self.make_branch_and_tree(path)
173
174
target_stat = os.stat('target/file1')
174
175
self.assertEqual(source_stat, target_stat)
177
def test_branch_files_from(self):
178
source = self.make_branch_and_tree('source')
179
self.build_tree(['source/file1'])
181
source.commit('added file')
182
out, err = self.run_bzr('branch source target --files-from source')
183
self.failUnlessExists('target/file1')
185
def test_branch_files_from_hardlink(self):
186
self.requireFeature(HardlinkFeature)
187
source = self.make_branch_and_tree('source')
188
self.build_tree(['source/file1'])
190
source.commit('added file')
191
source.bzrdir.sprout('second')
192
out, err = self.run_bzr('branch source target --files-from second'
194
source_stat = os.stat('source/file1')
195
second_stat = os.stat('second/file1')
196
target_stat = os.stat('target/file1')
197
self.assertNotEqual(source_stat, target_stat)
198
self.assertEqual(second_stat, target_stat)
176
200
def test_branch_standalone(self):
177
201
shared_repo = self.make_repository('repo', shared=True)
178
202
self.example_branch('source')
209
233
self.assertEqual('', out)
210
234
self.assertEqual('bzr: ERROR: Already a branch: "b".\n', err)
213
class TestBranchStacked(ExternalBase):
236
def test_branch_bind(self):
237
self.example_branch('a')
238
out, err = self.run_bzr('branch a b --bind')
239
self.assertEndsWith(err, "New branch bound to a\n")
240
b = branch.Branch.open('b')
241
self.assertEndsWith(b.get_bound_location(), '/a/')
243
def test_branch_with_post_branch_init_hook(self):
245
branch.Branch.hooks.install_named_hook('post_branch_init',
247
self.assertLength(0, calls)
248
self.example_branch('a')
249
self.assertLength(1, calls)
250
self.run_bzr('branch a b')
251
self.assertLength(2, calls)
253
def test_checkout_with_post_branch_init_hook(self):
255
branch.Branch.hooks.install_named_hook('post_branch_init',
257
self.assertLength(0, calls)
258
self.example_branch('a')
259
self.assertLength(1, calls)
260
self.run_bzr('checkout a b')
261
self.assertLength(2, calls)
263
def test_lightweight_checkout_with_post_branch_init_hook(self):
265
branch.Branch.hooks.install_named_hook('post_branch_init',
267
self.assertLength(0, calls)
268
self.example_branch('a')
269
self.assertLength(1, calls)
270
self.run_bzr('checkout --lightweight a b')
271
self.assertLength(2, calls)
274
class TestBranchStacked(TestCaseWithTransport):
214
275
"""Tests for branch --stacked"""
216
277
def assertRevisionInRepository(self, repo_path, revid):
302
363
def test_branch_stacked_from_smart_server(self):
303
364
# We can branch stacking on a smart server
304
from bzrlib.smart.server import SmartTCPServer_for_testing
305
self.transport_server = SmartTCPServer_for_testing
365
self.transport_server = test_server.SmartTCPServer_for_testing
306
366
trunk = self.make_branch('mainline', format='1.9')
307
367
out, err = self.run_bzr(
308
368
['branch', '--stacked', self.get_url('mainline'), 'shallow'])
318
378
' Packs 5 (adds stacking support, requires bzr 1.6)\n'
319
379
'Source branch format does not support stacking, using format:\n'
320
380
' Branch format 7\n'
381
'Doing on-the-fly conversion from RepositoryFormatKnitPack1() to RepositoryFormatKnitPack5().\n'
382
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
321
383
'Created new stacked branch referring to %s.\n' % (trunk.base,),
331
393
' Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)\n'
332
394
'Source branch format does not support stacking, using format:\n'
333
395
' Branch format 7\n'
396
'Doing on-the-fly conversion from RepositoryFormatKnitPack4() to RepositoryFormatKnitPack5RichRoot().\n'
397
'This may take some time. Upgrade the repositories to the same format for better performance.\n'
334
398
'Created new stacked branch referring to %s.\n' % (trunk.base,),
338
class TestSmartServerBranching(ExternalBase):
402
class TestSmartServerBranching(TestCaseWithTransport):
340
404
def test_branch_from_trivial_branch_to_same_server_branch_acceptance(self):
341
405
self.setup_smart_server_with_call_log()
added
removed
bzrlib/tests/blackbox/test_branch.py
