← 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: 2006-08-17 07:52:09 UTC
  • mfrom: (1910.3.4 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20060817075209-e85a1f9e05ff8b87
(andrew) Trivial fixes to NotImplemented errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 by 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
import os
21
21
 
22
22
from bzrlib import branch, bzrdir
23
 
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
 
23
from bzrlib.repository import RepositoryFormatKnit1
24
24
from bzrlib.tests.blackbox import ExternalBase
25
 
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
26
25
from bzrlib.workingtree import WorkingTree
27
26
 
28
27
 
29
28
class TestBranch(ExternalBase):
30
29
 
31
 
    def example_branch(self, path='.'):
32
 
        tree = self.make_branch_and_tree(path)
33
 
        self.build_tree_contents([(path + '/hello', 'foo')])
34
 
        tree.add('hello')
35
 
        tree.commit(message='setup')
36
 
        self.build_tree_contents([(path + '/goodbye', 'baz')])
37
 
        tree.add('goodbye')
38
 
        tree.commit(message='setup')
 
30
    def example_branch(test):
 
31
        test.runbzr('init')
 
32
        file('hello', 'wt').write('foo')
 
33
        test.runbzr('add hello')
 
34
        test.runbzr('commit -m setup hello')
 
35
        file('goodbye', 'wt').write('baz')
 
36
        test.runbzr('add goodbye')
 
37
        test.runbzr('commit -m setup goodbye')
39
38
 
40
39
    def test_branch(self):
41
40
        """Branch from one branch to another."""
42
 
        self.example_branch('a')
43
 
        self.run_bzr('branch a b')
 
41
        os.mkdir('a')
 
42
        os.chdir('a')
 
43
        self.example_branch()
 
44
        os.chdir('..')
 
45
        self.runbzr('branch a b')
44
46
        b = branch.Branch.open('b')
45
47
        self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read())
46
 
        self.run_bzr('branch a c -r 1')
47
 
        b.bzrdir.open_workingtree().commit(message='foo', allow_pointless=True)
 
48
        self.runbzr('branch a c -r 1')
 
49
        os.chdir('b')
 
50
        self.runbzr('commit -m foo --unchanged')
 
51
        os.chdir('..')
 
52
 
 
53
    def test_branch_basis(self):
 
54
        # ensure that basis really does grab from the basis by having incomplete source
 
55
        tree = self.make_branch_and_tree('commit_tree')
 
56
        self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
 
57
        tree.add('foo')
 
58
        tree.commit('revision 1', rev_id='1')
 
59
        source = self.make_branch_and_tree('source')
 
60
        # this gives us an incomplete repository
 
61
        tree.bzrdir.open_repository().copy_content_into(source.branch.repository)
 
62
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
 
63
        tree.bzrdir.open_branch().copy_content_into(source.branch)
 
64
        tree.copy_content_into(source)
 
65
        self.assertFalse(source.branch.repository.has_revision('2'))
 
66
        dir = source.bzrdir
 
67
        self.runbzr('branch source target --basis commit_tree')
 
68
        target = bzrdir.BzrDir.open('target')
 
69
        self.assertEqual('2', target.open_branch().last_revision())
 
70
        self.assertEqual('2', target.open_workingtree().last_revision())
 
71
        self.assertTrue(target.open_branch().repository.has_revision('2'))
48
72
 
49
73
    def test_branch_only_copies_history(self):
50
74
        # Knit branches should only push the history for the current revision.
77
101
 
78
102
        # Now that we have a repository with shared files, make sure
79
103
        # that things aren't copied out by a 'branch'
80
 
        self.run_bzr('branch repo/b branch-b')
 
104
        self.run_bzr('branch', 'repo/b', 'branch-b')
81
105
        pushed_tree = WorkingTree.open('branch-b')
82
106
        pushed_repo = pushed_tree.branch.repository
83
107
        self.assertFalse(pushed_repo.has_revision('a-1'))
85
109
        self.assertTrue(pushed_repo.has_revision('b-1'))
86
110
 
87
111
 
88
 
class TestRemoteBranch(TestCaseWithSFTPServer):
89
 
 
90
 
    def setUp(self):
91
 
        super(TestRemoteBranch, self).setUp()
92
 
        tree = self.make_branch_and_tree('branch')
93
 
        self.build_tree_contents([('branch/file', 'file content\n')])
94
 
        tree.add('file')
95
 
        tree.commit('file created')
96
 
 
97
 
    def test_branch_local_remote(self):
98
 
        self.run_bzr(['branch', 'branch', self.get_url('remote')])
99
 
        t = self.get_transport()
100
 
        # Ensure that no working tree what created remotely
101
 
        self.assertFalse(t.has('remote/file'))
102
 
 
103
 
    def test_branch_remote_remote(self):
104
 
        # Light cheat: we access the branch remotely
105
 
        self.run_bzr(['branch', self.get_url('branch'),
106
 
                      self.get_url('remote')])
107
 
        t = self.get_transport()
108
 
        # Ensure that no working tree what created remotely
109
 
        self.assertFalse(t.has('remote/file'))
110