← 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: 2010-08-02 17:16:12 UTC
  • mto: This revision was merged to the branch mainline in revision 5369.
  • Revision ID: john@arbash-meinel.com-20100802171612-rdh5ods70w2bl3j7
We also have to re-implement it for _simple_set_pyx.pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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_captured(['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
 
        out = self.capture('ancestry ' + location)
43
 
        if result is None:
 
45
        out = self.run_bzr(['ancestry', location])[0]
 
46
        if result is not None:
 
47
            self.assertEqualDiff(result, out)
 
48
        else:
 
49
            # A2 and B1 can be in either order, because they are parallel, and
 
50
            # thus their topological order is not defined
44
51
            result = "A1\nB1\nA2\nA3\n"
45
 
        self.assertEqualDiff(out, result)
 
52
            if result != out:
 
53
                result = "A1\nA2\nB1\nA3\n"
 
54
            self.assertEqualDiff(result, out)
46
55
 
47
56
    def test_ancestry(self):
48
57
        """Tests 'ancestry' command"""
58
67
    def test_ancestry_with_repo_branch(self):
59
68
        """Tests 'ancestry' command with a location that is a
60
69
        repository branch."""
61
 
        self._build_branches()
62
 
        self.run_bzr('init-repo', 'repo')
63
 
        self.run_bzr('branch', 'A', 'repo/A')
 
70
        a_tree = self._build_branches()[0]
 
71
 
 
72
        self.make_repository('repo', shared=True)
 
73
 
 
74
        a_tree.bzrdir.sprout('repo/A')
64
75
        self._check_ancestry('repo/A')
65
76
 
66
77
    def test_ancestry_with_checkout(self):
67
78
        """Tests 'ancestry' command with a location that is a
68
79
        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')
 
80
        a_tree = self._build_branches()[0]
 
81
        self.make_repository('repo', shared=True)
 
82
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
 
83
        repo_branch.create_checkout('A-checkout')
73
84
        self._check_ancestry('A-checkout')
74
85
 
75
86
    def test_ancestry_with_lightweight_checkout(self):
76
87
        """Tests 'ancestry' command with a location that is a
77
88
        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')
 
89
        a_tree = self._build_branches()[0]
 
90
        self.make_repository('repo', shared=True)
 
91
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
 
92
        repo_branch.create_checkout('A-checkout', lightweight=True)
82
93
        self._check_ancestry('A-checkout')
83
94
 
84
95
    def test_ancestry_with_truncated_checkout(self):
85
96
        """Tests 'ancestry' command with a location that is a
86
97
        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')
 
98
        a_tree = self._build_branches()[0]
 
99
        self.make_repository('repo', shared=True)
 
100
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
 
101
        repo_branch.create_checkout('A-checkout',
 
102
                                    revision_id=repo_branch.get_rev_id(2))
91
103
        self._check_ancestry('A-checkout', "A1\nA2\n")
92
104
 
93
105
    def test_ancestry_with_truncated_lightweight_checkout(self):
94
106
        """Tests 'ancestry' command with a location that is a lightweight
95
107
        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',
100
 
                'repo/A', 'A-checkout')
 
108
        a_tree = self._build_branches()[0]
 
109
        self.make_repository('repo', shared=True)
 
110
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
 
111
        repo_branch.create_checkout('A-checkout',
 
112
                                    revision_id=repo_branch.get_rev_id(2),
 
113
                                    lightweight=True)
101
114
        self._check_ancestry('A-checkout', "A1\nA2\n")