← 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: Robert Collins
  • Date: 2007-07-04 08:08:13 UTC
  • mfrom: (2572 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2587.
  • Revision ID: robertc@robertcollins.net-20070704080813-wzebx0r88fvwj5rq
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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.repository import RepositoryFormatKnit1
 
23
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit1
24
24
from bzrlib.tests.blackbox import ExternalBase
25
25
from bzrlib.workingtree import WorkingTree
26
26
 
28
28
class TestBranch(ExternalBase):
29
29
 
30
30
    def example_branch(test):
31
 
        test.runbzr('init')
 
31
        test.run_bzr('init')
32
32
        file('hello', 'wt').write('foo')
33
 
        test.runbzr('add hello')
34
 
        test.runbzr('commit -m setup hello')
 
33
        test.run_bzr('add hello')
 
34
        test.run_bzr('commit -m setup hello')
35
35
        file('goodbye', 'wt').write('baz')
36
 
        test.runbzr('add goodbye')
37
 
        test.runbzr('commit -m setup goodbye')
 
36
        test.run_bzr('add goodbye')
 
37
        test.run_bzr('commit -m setup goodbye')
38
38
 
39
39
    def test_branch(self):
40
40
        """Branch from one branch to another."""
42
42
        os.chdir('a')
43
43
        self.example_branch()
44
44
        os.chdir('..')
45
 
        self.runbzr('branch a b')
 
45
        self.run_bzr('branch a b')
46
46
        b = branch.Branch.open('b')
47
47
        self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read())
48
 
        self.runbzr('branch a c -r 1')
 
48
        self.run_bzr('branch a c -r 1')
49
49
        os.chdir('b')
50
 
        self.runbzr('commit -m foo --unchanged')
 
50
        self.run_bzr('commit -m foo --unchanged')
51
51
        os.chdir('..')
52
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().get_parent_ids())
71
 
        self.assertTrue(target.open_branch().repository.has_revision('2'))
72
 
 
73
53
    def test_branch_only_copies_history(self):
74
54
        # Knit branches should only push the history for the current revision.
75
55
        format = bzrdir.BzrDirMetaFormat1()