← 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 Packman
  • Date: 2011-12-23 19:38:22 UTC
  • mto: This revision was merged to the branch mainline in revision 6405.
  • Revision ID: martin.packman@canonical.com-20111223193822-hesheea4o8aqwexv
Accept and document passing the medium rather than transport for smart connections

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
 
from bzrlib.workingtree import WorkingTree
22
 
from bzrlib.branch import Branch
23
 
 
24
20
 
25
21
class TestAncestry(TestCaseWithTransport):
26
22
 
27
23
    def _build_branches(self):
28
24
        a_wt = self.make_branch_and_tree('A')
29
 
        open('A/foo', 'wb').write('1111\n')
 
25
        self.build_tree_contents([('A/foo', '1111\n')])
30
26
        a_wt.add('foo')
31
27
        a_wt.commit('added foo',rev_id='A1')
32
 
        self.run_bzr(['branch', 'A', 'B'])
33
 
        b_wt = WorkingTree.open('B')
34
 
        open('B/foo','wb').write('1111\n22\n')
 
28
 
 
29
        b_wt = a_wt.bzrdir.sprout('B').open_workingtree()
 
30
        self.build_tree_contents([('B/foo', '1111\n22\n')])
35
31
        b_wt.commit('modified B/foo',rev_id='B1')
36
 
        open('A/foo', 'wb').write('000\n1111\n')
 
32
 
 
33
        self.build_tree_contents([('A/foo', '000\n1111\n')])
37
34
        a_wt.commit('modified A/foo',rev_id='A2')
38
 
        merge(['B',-1],['B',1],this_dir='A')
 
35
 
 
36
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
 
37
            b_wt.branch.get_rev_id(1))
39
38
        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
42
        out = self.run_bzr(['ancestry', location])[0]
43
 
        if result is None:
 
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
44
48
            result = "A1\nB1\nA2\nA3\n"
45
 
        self.assertEqualDiff(out, result)
 
49
            if result != out:
 
50
                result = "A1\nA2\nB1\nA3\n"
 
51
            self.assertEqualDiff(result, out)
46
52
 
47
53
    def test_ancestry(self):
48
54
        """Tests 'ancestry' command"""
58
64
    def test_ancestry_with_repo_branch(self):
59
65
        """Tests 'ancestry' command with a location that is a
60
66
        repository branch."""
61
 
        self._build_branches()
62
 
        self.run_bzr('init-repo', 'repo')
63
 
        self.run_bzr('branch', 'A', 'repo/A')
 
67
        a_tree = self._build_branches()[0]
 
68
 
 
69
        self.make_repository('repo', shared=True)
 
70
 
 
71
        a_tree.bzrdir.sprout('repo/A')
64
72
        self._check_ancestry('repo/A')
65
73
 
66
74
    def test_ancestry_with_checkout(self):
67
75
        """Tests 'ancestry' command with a location that is a
68
76
        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')
 
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')
73
81
        self._check_ancestry('A-checkout')
74
82
 
75
83
    def test_ancestry_with_lightweight_checkout(self):
76
84
        """Tests 'ancestry' command with a location that is a
77
85
        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')
 
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)
82
90
        self._check_ancestry('A-checkout')
83
91
 
84
92
    def test_ancestry_with_truncated_checkout(self):
85
93
        """Tests 'ancestry' command with a location that is a
86
94
        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')
 
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))
91
100
        self._check_ancestry('A-checkout', "A1\nA2\n")
92
101
 
93
102
    def test_ancestry_with_truncated_lightweight_checkout(self):
94
103
        """Tests 'ancestry' command with a location that is a lightweight
95
104
        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')
 
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)
101
111
        self._check_ancestry('A-checkout', "A1\nA2\n")