← 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: Andrew Bennetts
  • Date: 2007-03-26 06:24:01 UTC
  • mto: This revision was merged to the branch mainline in revision 2376.
  • Revision ID: andrew.bennetts@canonical.com-20070326062401-k3nbefzje5332jaf
Deal with review comments from Robert:

  * Add my name to the NEWS file
  * Move the test case to a new module in branch_implementations
  * Remove revision_history cruft from identitymap and test_identitymap
  * Improve some docstrings

Also, this fixes a bug where revision_history was not returning a copy of the
cached data, allowing the cache to be corrupted.

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