← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2008-09-26 22:14:42 UTC
  • mto: This revision was merged to the branch mainline in revision 3747.
  • Revision ID: john@arbash-meinel.com-20080926221442-3r67j99sr9rwe9w0
Make message optional, don't check the memory flag directly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib.builtins import merge
20
19
from bzrlib.tests import TestCaseWithTransport
21
20
from bzrlib.workingtree import WorkingTree
22
21
from bzrlib.branch import Branch
26
25
 
27
26
    def _build_branches(self):
28
27
        a_wt = self.make_branch_and_tree('A')
29
 
        open('A/foo', 'wb').write('1111\n')
 
28
        self.build_tree_contents([('A/foo', '1111\n')])
30
29
        a_wt.add('foo')
31
30
        a_wt.commit('added foo',rev_id='A1')
32
 
        self.run_bzr('branch A B')
33
 
        b_wt = WorkingTree.open('B')
34
 
        open('B/foo','wb').write('1111\n22\n')
 
31
 
 
32
        b_wt = a_wt.bzrdir.sprout('B').open_workingtree()
 
33
        self.build_tree_contents([('B/foo', '1111\n22\n')])
35
34
        b_wt.commit('modified B/foo',rev_id='B1')
36
 
        open('A/foo', 'wb').write('000\n1111\n')
 
35
 
 
36
        self.build_tree_contents([('A/foo', '000\n1111\n')])
37
37
        a_wt.commit('modified A/foo',rev_id='A2')
38
 
        merge(['B',-1],['B',1],this_dir='A')
 
38
 
 
39
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
 
40
            b_wt.branch.get_rev_id(1))
39
41
        a_wt.commit('merged B into A',rev_id='A3')
 
42
        return a_wt, b_wt
40
43
 
41
44
    def _check_ancestry(self, location='', result=None):
42
45
        out = self.run_bzr(['ancestry', location])[0]
58
61
    def test_ancestry_with_repo_branch(self):
59
62
        """Tests 'ancestry' command with a location that is a
60
63
        repository branch."""
61
 
        self._build_branches()
62
 
        self.run_bzr('init-repo repo')
63
 
        self.run_bzr('branch A repo/A')
 
64
        a_tree = self._build_branches()[0]
 
65
 
 
66
        self.make_repository('repo', shared=True)
 
67
 
 
68
        a_tree.bzrdir.sprout('repo/A')
64
69
        self._check_ancestry('repo/A')
65
70
 
66
71
    def test_ancestry_with_checkout(self):
67
72
        """Tests 'ancestry' command with a location that is a
68
73
        checkout of a repository branch."""
69
 
        self._build_branches()
70
 
        self.run_bzr('init-repo repo')
71
 
        self.run_bzr('branch A repo/A')
72
 
        self.run_bzr('checkout repo/A A-checkout')
 
74
        a_tree = self._build_branches()[0]
 
75
        self.make_repository('repo', shared=True)
 
76
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
 
77
        repo_branch.create_checkout('A-checkout')
73
78
        self._check_ancestry('A-checkout')
74
79
 
75
80
    def test_ancestry_with_lightweight_checkout(self):
76
81
        """Tests 'ancestry' command with a location that is a
77
82
        lightweight checkout of a repository branch."""
78
 
        self._build_branches()
79
 
        self.run_bzr('init-repo repo')
80
 
        self.run_bzr('branch A repo/A')
81
 
        self.run_bzr('checkout --lightweight repo/A A-checkout')
 
83
        a_tree = self._build_branches()[0]
 
84
        self.make_repository('repo', shared=True)
 
85
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
 
86
        repo_branch.create_checkout('A-checkout', lightweight=True)
82
87
        self._check_ancestry('A-checkout')
83
88
 
84
89
    def test_ancestry_with_truncated_checkout(self):
85
90
        """Tests 'ancestry' command with a location that is a
86
91
        checkout of a repository branch with a shortened revision history."""
87
 
        self._build_branches()
88
 
        self.run_bzr('init-repo repo')
89
 
        self.run_bzr('branch A repo/A')
90
 
        self.run_bzr('checkout -r 2 repo/A A-checkout')
 
92
        a_tree = self._build_branches()[0]
 
93
        self.make_repository('repo', shared=True)
 
94
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
 
95
        repo_branch.create_checkout('A-checkout',
 
96
                                    revision_id=repo_branch.get_rev_id(2))
91
97
        self._check_ancestry('A-checkout', "A1\nA2\n")
92
98
 
93
99
    def test_ancestry_with_truncated_lightweight_checkout(self):
94
100
        """Tests 'ancestry' command with a location that is a lightweight
95
101
        checkout of a repository branch with a shortened revision history."""
96
 
        self._build_branches()
97
 
        self.run_bzr('init-repo repo')
98
 
        self.run_bzr('branch A repo/A')
99
 
        self.run_bzr('checkout -r 2 --lightweight repo/A A-checkout')
 
102
        a_tree = self._build_branches()[0]
 
103
        self.make_repository('repo', shared=True)
 
104
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
 
105
        repo_branch.create_checkout('A-checkout',
 
106
                                    revision_id=repo_branch.get_rev_id(2),
 
107
                                    lightweight=True)
100
108
        self._check_ancestry('A-checkout', "A1\nA2\n")