~bzr-pqm/bzr/bzr.dev

2052.3.1 by John Arbash Meinel
Add tests to cleanup the copyright of all source files
1
# Copyright (C) 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1551.3.11 by Aaron Bentley
Merge from Robert
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1551.3.11 by Aaron Bentley
Merge from Robert
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1551.3.11 by Aaron Bentley
Merge from Robert
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1551.3.11 by Aaron Bentley
Merge from Robert
16
17
import os
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
18
19
from bzrlib.tests import TestCaseWithTransport
20
from bzrlib.workingtree import WorkingTree
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
21
from bzrlib.branch import Branch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
22
23
24
class TestAncestry(TestCaseWithTransport):
1551.3.11 by Aaron Bentley
Merge from Robert
25
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
26
    def _build_branches(self):
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
27
        a_wt = self.make_branch_and_tree('A')
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
28
        self.build_tree_contents([('A/foo', '1111\n')])
1551.3.11 by Aaron Bentley
Merge from Robert
29
        a_wt.add('foo')
30
        a_wt.commit('added foo',rev_id='A1')
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
31
32
        b_wt = a_wt.bzrdir.sprout('B').open_workingtree()
33
        self.build_tree_contents([('B/foo', '1111\n22\n')])
1551.3.11 by Aaron Bentley
Merge from Robert
34
        b_wt.commit('modified B/foo',rev_id='B1')
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
35
36
        self.build_tree_contents([('A/foo', '000\n1111\n')])
1551.3.11 by Aaron Bentley
Merge from Robert
37
        a_wt.commit('modified A/foo',rev_id='A2')
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
38
1551.15.70 by Aaron Bentley
Avoid using builtins.merge
39
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
40
            b_wt.branch.get_rev_id(1))
1551.3.11 by Aaron Bentley
Merge from Robert
41
        a_wt.commit('merged B into A',rev_id='A3')
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
42
        return a_wt, b_wt
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
43
44
    def _check_ancestry(self, location='', result=None):
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
45
        out = self.run_bzr(['ancestry', location])[0]
4593.5.41 by John Arbash Meinel
Fix a few test cases that assumed topological sorting was stable.
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)
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
55
56
    def test_ancestry(self):
57
        """Tests 'ancestry' command"""
58
        self._build_branches()
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
59
        os.chdir('A')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
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."""
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
70
        a_tree = self._build_branches()[0]
71
72
        self.make_repository('repo', shared=True)
73
74
        a_tree.bzrdir.sprout('repo/A')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
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."""
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
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')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
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."""
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
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)
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
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."""
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
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))
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
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."""
2664.6.3 by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate.
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)
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
114
        self._check_ancestry('A-checkout', "A1\nA2\n")