~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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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')
1551.3.11 by Aaron Bentley
Merge from Robert
28
        open('A/foo', 'wb').write('1111\n')
29
        a_wt.add('foo')
30
        a_wt.commit('added foo',rev_id='A1')
2552.2.2 by Vincent Ladeuil
Enforce run_bzr(string) where possible.
31
        self.run_bzr('branch A B')
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.
32
        b_wt = WorkingTree.open('B')
1551.3.11 by Aaron Bentley
Merge from Robert
33
        open('B/foo','wb').write('1111\n22\n')
34
        b_wt.commit('modified B/foo',rev_id='B1')
35
        open('A/foo', 'wb').write('000\n1111\n')
36
        a_wt.commit('modified A/foo',rev_id='A2')
1551.15.70 by Aaron Bentley
Avoid using builtins.merge
37
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
38
            b_wt.branch.get_rev_id(1))
1551.3.11 by Aaron Bentley
Merge from Robert
39
        a_wt.commit('merged B into A',rev_id='A3')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
40
41
    def _check_ancestry(self, location='', result=None):
2530.3.4 by Martin Pool
Deprecate run_bzr_captured in favour of just run_bzr
42
        out = self.run_bzr(['ancestry', location])[0]
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
43
        if result is None:
44
            result = "A1\nB1\nA2\nA3\n"
45
        self.assertEqualDiff(out, result)
46
47
    def test_ancestry(self):
48
        """Tests 'ancestry' command"""
49
        self._build_branches()
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
50
        os.chdir('A')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
51
        self._check_ancestry()
52
53
    def test_ancestry_with_location(self):
54
        """Tests 'ancestry' command with a specified location."""
55
        self._build_branches()
56
        self._check_ancestry('A')
57
58
    def test_ancestry_with_repo_branch(self):
59
        """Tests 'ancestry' command with a location that is a
60
        repository branch."""
61
        self._build_branches()
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
62
        self.run_bzr('init-repo repo')
63
        self.run_bzr('branch A repo/A')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
64
        self._check_ancestry('repo/A')
65
66
    def test_ancestry_with_checkout(self):
67
        """Tests 'ancestry' command with a location that is a
68
        checkout of a repository branch."""
69
        self._build_branches()
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
70
        self.run_bzr('init-repo repo')
71
        self.run_bzr('branch A repo/A')
72
        self.run_bzr('checkout repo/A A-checkout')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
73
        self._check_ancestry('A-checkout')
74
75
    def test_ancestry_with_lightweight_checkout(self):
76
        """Tests 'ancestry' command with a location that is a
77
        lightweight checkout of a repository branch."""
78
        self._build_branches()
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
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')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
82
        self._check_ancestry('A-checkout')
83
84
    def test_ancestry_with_truncated_checkout(self):
85
        """Tests 'ancestry' command with a location that is a
86
        checkout of a repository branch with a shortened revision history."""
87
        self._build_branches()
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
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')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
91
        self._check_ancestry('A-checkout', "A1\nA2\n")
92
93
    def test_ancestry_with_truncated_lightweight_checkout(self):
94
        """Tests 'ancestry' command with a location that is a lightweight
95
        checkout of a repository branch with a shortened revision history."""
96
        self._build_branches()
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
97
        self.run_bzr('init-repo repo')
98
        self.run_bzr('branch A repo/A')
99
        self.run_bzr('checkout -r 2 --lightweight repo/A A-checkout')
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
100
        self._check_ancestry('A-checkout', "A1\nA2\n")