← 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: Martin Pool
  • Date: 2005-06-10 02:41:06 UTC
  • Revision ID: mbp@sourcefrog.net-20050610024106-d57225e68c6457b3
- notes on patches for Windows

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
3
 
# This program is free software; you can redistribute it and/or modify
4
 
# it under the terms of the GNU General Public License as published by
5
 
# the Free Software Foundation; either version 2 of the License, or
6
 
# (at your option) any later version.
7
 
#
8
 
# This program is distributed in the hope that it will be useful,
9
 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
 
# GNU General Public License for more details.
12
 
#
13
 
# You should have received a copy of the GNU General Public License
14
 
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
import os
18
 
 
19
 
from bzrlib.tests import TestCaseWithTransport
20
 
from bzrlib.workingtree import WorkingTree
21
 
from bzrlib.branch import Branch
22
 
 
23
 
 
24
 
class TestAncestry(TestCaseWithTransport):
25
 
 
26
 
    def _build_branches(self):
27
 
        a_wt = self.make_branch_and_tree('A')
28
 
        self.build_tree_contents([('A/foo', '1111\n')])
29
 
        a_wt.add('foo')
30
 
        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')])
34
 
        b_wt.commit('modified B/foo',rev_id='B1')
35
 
 
36
 
        self.build_tree_contents([('A/foo', '000\n1111\n')])
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))
41
 
        a_wt.commit('merged B into A',rev_id='A3')
42
 
        return a_wt, b_wt
43
 
 
44
 
    def _check_ancestry(self, location='', result=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
51
 
            result = "A1\nB1\nA2\nA3\n"
52
 
            if result != out:
53
 
                result = "A1\nA2\nB1\nA3\n"
54
 
            self.assertEqualDiff(result, out)
55
 
 
56
 
    def test_ancestry(self):
57
 
        """Tests 'ancestry' command"""
58
 
        self._build_branches()
59
 
        os.chdir('A')
60
 
        self._check_ancestry()
61
 
 
62
 
    def test_ancestry_with_location(self):
63
 
        """Tests 'ancestry' command with a specified location."""
64
 
        self._build_branches()
65
 
        self._check_ancestry('A')
66
 
 
67
 
    def test_ancestry_with_repo_branch(self):
68
 
        """Tests 'ancestry' command with a location that is a
69
 
        repository branch."""
70
 
        a_tree = self._build_branches()[0]
71
 
 
72
 
        self.make_repository('repo', shared=True)
73
 
 
74
 
        a_tree.bzrdir.sprout('repo/A')
75
 
        self._check_ancestry('repo/A')
76
 
 
77
 
    def test_ancestry_with_checkout(self):
78
 
        """Tests 'ancestry' command with a location that is a
79
 
        checkout of a repository branch."""
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')
84
 
        self._check_ancestry('A-checkout')
85
 
 
86
 
    def test_ancestry_with_lightweight_checkout(self):
87
 
        """Tests 'ancestry' command with a location that is a
88
 
        lightweight checkout of a repository branch."""
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)
93
 
        self._check_ancestry('A-checkout')
94
 
 
95
 
    def test_ancestry_with_truncated_checkout(self):
96
 
        """Tests 'ancestry' command with a location that is a
97
 
        checkout of a repository branch with a shortened revision history."""
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))
103
 
        self._check_ancestry('A-checkout', "A1\nA2\n")
104
 
 
105
 
    def test_ancestry_with_truncated_lightweight_checkout(self):
106
 
        """Tests 'ancestry' command with a location that is a lightweight
107
 
        checkout of a repository branch with a shortened revision history."""
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)
114
 
        self._check_ancestry('A-checkout', "A1\nA2\n")