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 |
||
21 |
class TestAncestry(TestCaseWithTransport): |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
22 |
|
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
23 |
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. |
24 |
a_wt = self.make_branch_and_tree('A') |
2664.6.3
by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate. |
25 |
self.build_tree_contents([('A/foo', '1111\n')]) |
1551.3.11
by Aaron Bentley
Merge from Robert |
26 |
a_wt.add('foo') |
27 |
a_wt.commit('added foo',rev_id='A1') |
|
2664.6.3
by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate. |
28 |
|
29 |
b_wt = a_wt.bzrdir.sprout('B').open_workingtree() |
|
30 |
self.build_tree_contents([('B/foo', '1111\n22\n')]) |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
31 |
b_wt.commit('modified B/foo',rev_id='B1') |
2664.6.3
by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate. |
32 |
|
33 |
self.build_tree_contents([('A/foo', '000\n1111\n')]) |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
34 |
a_wt.commit('modified A/foo',rev_id='A2') |
2664.6.3
by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate. |
35 |
|
1551.15.70
by Aaron Bentley
Avoid using builtins.merge |
36 |
a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(), |
37 |
b_wt.branch.get_rev_id(1)) |
|
1551.3.11
by Aaron Bentley
Merge from Robert |
38 |
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. |
39 |
return a_wt, b_wt |
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] |
4593.5.41
by John Arbash Meinel
Fix a few test cases that assumed topological sorting was stable. |
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
|
|
48 |
result = "A1\nB1\nA2\nA3\n" |
|
49 |
if result != out: |
|
50 |
result = "A1\nA2\nB1\nA3\n" |
|
51 |
self.assertEqualDiff(result, out) |
|
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
52 |
|
53 |
def test_ancestry(self): |
|
54 |
"""Tests 'ancestry' command"""
|
|
55 |
self._build_branches() |
|
1668.1.14
by Martin Pool
merge olaf - InvalidRevisionId fixes |
56 |
os.chdir('A') |
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
57 |
self._check_ancestry() |
58 |
||
59 |
def test_ancestry_with_location(self): |
|
60 |
"""Tests 'ancestry' command with a specified location."""
|
|
61 |
self._build_branches() |
|
62 |
self._check_ancestry('A') |
|
63 |
||
64 |
def test_ancestry_with_repo_branch(self): |
|
65 |
"""Tests 'ancestry' command with a location that is a
|
|
66 |
repository branch."""
|
|
2664.6.3
by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate. |
67 |
a_tree = self._build_branches()[0] |
68 |
||
69 |
self.make_repository('repo', shared=True) |
|
70 |
||
71 |
a_tree.bzrdir.sprout('repo/A') |
|
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
72 |
self._check_ancestry('repo/A') |
73 |
||
74 |
def test_ancestry_with_checkout(self): |
|
75 |
"""Tests 'ancestry' command with a location that is a
|
|
76 |
checkout of a repository branch."""
|
|
2664.6.3
by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate. |
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') |
|
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
81 |
self._check_ancestry('A-checkout') |
82 |
||
83 |
def test_ancestry_with_lightweight_checkout(self): |
|
84 |
"""Tests 'ancestry' command with a location that is a
|
|
85 |
lightweight checkout of a repository branch."""
|
|
2664.6.3
by Daniel Watkins
tests.blackbox.test_ancestry now uses internals where appropriate. |
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) |
|
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
90 |
self._check_ancestry('A-checkout') |
91 |
||
92 |
def test_ancestry_with_truncated_checkout(self): |
|
93 |
"""Tests 'ancestry' command with a location that is a
|
|
94 |
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. |
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)) |
|
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") |
101 |
||
102 |
def test_ancestry_with_truncated_lightweight_checkout(self): |
|
103 |
"""Tests 'ancestry' command with a location that is a lightweight
|
|
104 |
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. |
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) |
|
1733.2.2
by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts. |
111 |
self._check_ancestry('A-checkout', "A1\nA2\n") |