← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-06-20 01:09:18 UTC
  • mfrom: (3505.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080620010918-64z4xylh1ap5hgyf
Accept user names with @s in URLs (Neil Martinsen-Burrell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
 
1
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
"""Black-box tests for bzr branch."""
 
19
 
 
20
import os
 
21
 
 
22
from bzrlib import branch, bzrdir
 
23
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
 
24
from bzrlib.tests.blackbox import ExternalBase
 
25
from bzrlib.tests import HardlinkFeature
 
26
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
 
27
from bzrlib.workingtree import WorkingTree
 
28
 
 
29
 
 
30
class TestBranch(ExternalBase):
 
31
 
 
32
    def example_branch(self, path='.'):
 
33
        tree = self.make_branch_and_tree(path)
 
34
        self.build_tree_contents([(path + '/hello', 'foo')])
 
35
        tree.add('hello')
 
36
        tree.commit(message='setup')
 
37
        self.build_tree_contents([(path + '/goodbye', 'baz')])
 
38
        tree.add('goodbye')
 
39
        tree.commit(message='setup')
 
40
 
 
41
    def test_branch(self):
 
42
        """Branch from one branch to another."""
 
43
        self.example_branch('a')
 
44
        self.run_bzr('branch a b')
 
45
        b = branch.Branch.open('b')
 
46
        self.run_bzr('branch a c -r 1')
 
47
        # previously was erroneously created by branching
 
48
        self.assertFalse(b._transport.has('branch-name'))
 
49
        b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
 
50
 
 
51
    def test_branch_only_copies_history(self):
 
52
        # Knit branches should only push the history for the current revision.
 
53
        format = bzrdir.BzrDirMetaFormat1()
 
54
        format.repository_format = RepositoryFormatKnit1()
 
55
        shared_repo = self.make_repository('repo', format=format, shared=True)
 
56
        shared_repo.set_make_working_trees(True)
 
57
 
 
58
        def make_shared_tree(path):
 
59
            shared_repo.bzrdir.root_transport.mkdir(path)
 
60
            shared_repo.bzrdir.create_branch_convenience('repo/' + path)
 
61
            return WorkingTree.open('repo/' + path)
 
62
        tree_a = make_shared_tree('a')
 
63
        self.build_tree(['repo/a/file'])
 
64
        tree_a.add('file')
 
65
        tree_a.commit('commit a-1', rev_id='a-1')
 
66
        f = open('repo/a/file', 'ab')
 
67
        f.write('more stuff\n')
 
68
        f.close()
 
69
        tree_a.commit('commit a-2', rev_id='a-2')
 
70
 
 
71
        tree_b = make_shared_tree('b')
 
72
        self.build_tree(['repo/b/file'])
 
73
        tree_b.add('file')
 
74
        tree_b.commit('commit b-1', rev_id='b-1')
 
75
 
 
76
        self.assertTrue(shared_repo.has_revision('a-1'))
 
77
        self.assertTrue(shared_repo.has_revision('a-2'))
 
78
        self.assertTrue(shared_repo.has_revision('b-1'))
 
79
 
 
80
        # Now that we have a repository with shared files, make sure
 
81
        # that things aren't copied out by a 'branch'
 
82
        self.run_bzr('branch repo/b branch-b')
 
83
        pushed_tree = WorkingTree.open('branch-b')
 
84
        pushed_repo = pushed_tree.branch.repository
 
85
        self.assertFalse(pushed_repo.has_revision('a-1'))
 
86
        self.assertFalse(pushed_repo.has_revision('a-2'))
 
87
        self.assertTrue(pushed_repo.has_revision('b-1'))
 
88
 
 
89
    def test_branch_hardlink(self):
 
90
        self.requireFeature(HardlinkFeature)
 
91
        source = self.make_branch_and_tree('source')
 
92
        self.build_tree(['source/file1'])
 
93
        source.add('file1')
 
94
        source.commit('added file')
 
95
        self.run_bzr(['branch', 'source', 'target', '--hardlink'])
 
96
        source_stat = os.stat('source/file1')
 
97
        target_stat = os.stat('target/file1')
 
98
        self.assertEqual(source_stat, target_stat)
 
99
 
 
100
 
 
101
class TestRemoteBranch(TestCaseWithSFTPServer):
 
102
 
 
103
    def setUp(self):
 
104
        super(TestRemoteBranch, self).setUp()
 
105
        tree = self.make_branch_and_tree('branch')
 
106
        self.build_tree_contents([('branch/file', 'file content\n')])
 
107
        tree.add('file')
 
108
        tree.commit('file created')
 
109
 
 
110
    def test_branch_local_remote(self):
 
111
        self.run_bzr(['branch', 'branch', self.get_url('remote')])
 
112
        t = self.get_transport()
 
113
        # Ensure that no working tree what created remotely
 
114
        self.assertFalse(t.has('remote/file'))
 
115
 
 
116
    def test_branch_remote_remote(self):
 
117
        # Light cheat: we access the branch remotely
 
118
        self.run_bzr(['branch', self.get_url('branch'),
 
119
                      self.get_url('remote')])
 
120
        t = self.get_transport()
 
121
        # Ensure that no working tree what created remotely
 
122
        self.assertFalse(t.has('remote/file'))
 
123