← 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: Aaron Bentley
  • Date: 2007-06-11 14:59:52 UTC
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070611145952-cwt4480gphdhen6l
Get installation started

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
 
 
19
from bzrlib.builtins import merge
19
20
from bzrlib.tests import TestCaseWithTransport
 
21
from bzrlib.workingtree import WorkingTree
 
22
from bzrlib.branch import Branch
 
23
 
20
24
 
21
25
class TestAncestry(TestCaseWithTransport):
22
26
 
23
27
    def _build_branches(self):
24
28
        a_wt = self.make_branch_and_tree('A')
25
 
        self.build_tree_contents([('A/foo', '1111\n')])
 
29
        open('A/foo', 'wb').write('1111\n')
26
30
        a_wt.add('foo')
27
31
        a_wt.commit('added foo',rev_id='A1')
28
 
 
29
 
        b_wt = a_wt.bzrdir.sprout('B').open_workingtree()
30
 
        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')
31
35
        b_wt.commit('modified B/foo',rev_id='B1')
32
 
 
33
 
        self.build_tree_contents([('A/foo', '000\n1111\n')])
 
36
        open('A/foo', 'wb').write('000\n1111\n')
34
37
        a_wt.commit('modified A/foo',rev_id='A2')
35
 
 
36
 
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
37
 
            b_wt.branch.get_rev_id(1))
 
38
        merge(['B',-1],['B',1],this_dir='A')
38
39
        a_wt.commit('merged B into A',rev_id='A3')
39
 
        return a_wt, b_wt
40
40
 
41
41
    def _check_ancestry(self, location='', result=None):
42
 
        out = self.run_bzr(['ancestry', location])[0]
43
 
        if result is not None:
44
 
            self.assertEqualDiff(result, out)
45
 
        else:
46
 
            # A2 and B1 can be in either order, because they are parallel, and
47
 
            # thus their topological order is not defined
 
42
        out = self.capture('ancestry ' + location)
 
43
        if result is None:
48
44
            result = "A1\nB1\nA2\nA3\n"
49
 
            if result != out:
50
 
                result = "A1\nA2\nB1\nA3\n"
51
 
            self.assertEqualDiff(result, out)
 
45
        self.assertEqualDiff(out, result)
52
46
 
53
47
    def test_ancestry(self):
54
48
        """Tests 'ancestry' command"""
64
58
    def test_ancestry_with_repo_branch(self):
65
59
        """Tests 'ancestry' command with a location that is a
66
60
        repository branch."""
67
 
        a_tree = self._build_branches()[0]
68
 
 
69
 
        self.make_repository('repo', shared=True)
70
 
 
71
 
        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')
72
64
        self._check_ancestry('repo/A')
73
65
 
74
66
    def test_ancestry_with_checkout(self):
75
67
        """Tests 'ancestry' command with a location that is a
76
68
        checkout of a repository branch."""
77
 
        a_tree = self._build_branches()[0]
78
 
        self.make_repository('repo', shared=True)
79
 
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
80
 
        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')
81
73
        self._check_ancestry('A-checkout')
82
74
 
83
75
    def test_ancestry_with_lightweight_checkout(self):
84
76
        """Tests 'ancestry' command with a location that is a
85
77
        lightweight checkout of a repository branch."""
86
 
        a_tree = self._build_branches()[0]
87
 
        self.make_repository('repo', shared=True)
88
 
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
89
 
        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')
90
82
        self._check_ancestry('A-checkout')
91
83
 
92
84
    def test_ancestry_with_truncated_checkout(self):
93
85
        """Tests 'ancestry' command with a location that is a
94
86
        checkout of a repository branch with a shortened revision history."""
95
 
        a_tree = self._build_branches()[0]
96
 
        self.make_repository('repo', shared=True)
97
 
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
98
 
        repo_branch.create_checkout('A-checkout',
99
 
                                    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')
100
91
        self._check_ancestry('A-checkout', "A1\nA2\n")
101
92
 
102
93
    def test_ancestry_with_truncated_lightweight_checkout(self):
103
94
        """Tests 'ancestry' command with a location that is a lightweight
104
95
        checkout of a repository branch with a shortened revision history."""
105
 
        a_tree = self._build_branches()[0]
106
 
        self.make_repository('repo', shared=True)
107
 
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
108
 
        repo_branch.create_checkout('A-checkout',
109
 
                                    revision_id=repo_branch.get_rev_id(2),
110
 
                                    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')
111
101
        self._check_ancestry('A-checkout', "A1\nA2\n")