← 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: 2006-05-27 01:54:40 UTC
  • mto: (1711.2.26 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1734.
  • Revision ID: john@arbash-meinel.com-20060527015440-1a10495d8e56ed5f
deprecating appendpath, it does exactly what pathjoin does

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
 
#
 
1
# -*- coding: utf-8 -*-
 
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
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
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
20
21
from bzrlib.workingtree import WorkingTree
21
 
from bzrlib.branch import Branch
22
22
 
23
23
 
24
24
class TestAncestry(TestCaseWithTransport):
25
25
 
26
 
    def _build_branches(self):
 
26
    def test_ancestry(self):
 
27
        """Tests 'ancestry' command"""
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
 
 
44
 
    def _check_ancestry(self, location='', result=None):
45
 
        out = self.run_bzr(['ancestry', location])[0]
46
 
        if result is None:
47
 
            result = "A1\nB1\nA2\nA3\n"
48
 
        self.assertEqualDiff(out, result)
49
 
 
50
 
    def test_ancestry(self):
51
 
        """Tests 'ancestry' command"""
52
 
        self._build_branches()
53
40
        os.chdir('A')
54
 
        self._check_ancestry()
55
 
 
56
 
    def test_ancestry_with_location(self):
57
 
        """Tests 'ancestry' command with a specified location."""
58
 
        self._build_branches()
59
 
        self._check_ancestry('A')
60
 
 
61
 
    def test_ancestry_with_repo_branch(self):
62
 
        """Tests 'ancestry' command with a location that is a
63
 
        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')
69
 
        self._check_ancestry('repo/A')
70
 
 
71
 
    def test_ancestry_with_checkout(self):
72
 
        """Tests 'ancestry' command with a location that is a
73
 
        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')
78
 
        self._check_ancestry('A-checkout')
79
 
 
80
 
    def test_ancestry_with_lightweight_checkout(self):
81
 
        """Tests 'ancestry' command with a location that is a
82
 
        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)
87
 
        self._check_ancestry('A-checkout')
88
 
 
89
 
    def test_ancestry_with_truncated_checkout(self):
90
 
        """Tests 'ancestry' command with a location that is a
91
 
        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))
97
 
        self._check_ancestry('A-checkout', "A1\nA2\n")
98
 
 
99
 
    def test_ancestry_with_truncated_lightweight_checkout(self):
100
 
        """Tests 'ancestry' command with a location that is a lightweight
101
 
        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)
108
 
        self._check_ancestry('A-checkout', "A1\nA2\n")
 
41
        out, err = self.run_bzr('ancestry')
 
42
        self.assertEquals(err, '')
 
43
        self.assertEqualDiff(out,
 
44
"""A1
 
45
B1
 
46
A2
 
47
A3
 
48
""")
 
49