5557.1.15
by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt |
1 |
# Copyright (C) 2005-2011 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
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 |
#
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
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 |
#
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
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
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
16 |
|
1263
by Martin Pool
- clean up imports |
17 |
|
1685.1.67
by Martin Pool
Suppress warning from test of deprecated method |
18 |
import warnings |
1263
by Martin Pool
- clean up imports |
19 |
|
1911.2.1
by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate |
20 |
from bzrlib import ( |
4119.4.3
by Jonathan Lange
Add Revision.iter_bugs. |
21 |
bugtracker, |
1911.2.1
by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate |
22 |
revision, |
23 |
)
|
|
4119.4.3
by Jonathan Lange
Add Revision.iter_bugs. |
24 |
from bzrlib.errors import ( |
25 |
InvalidBugStatus, |
|
26 |
InvalidLineInBugsProperty, |
|
27 |
)
|
|
5579.3.1
by Jelmer Vernooij
Remove unused imports. |
28 |
from bzrlib.revision import NULL_REVISION |
1911.2.1
by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate |
29 |
from bzrlib.tests import TestCase, TestCaseWithTransport |
1270
by Martin Pool
- fix recording of merged ancestry lines |
30 |
from bzrlib.trace import mutter |
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
31 |
|
1685.1.67
by Martin Pool
Suppress warning from test of deprecated method |
32 |
# We're allowed to test deprecated interfaces
|
33 |
warnings.filterwarnings('ignore', |
|
34 |
'.*get_intervening_revisions was deprecated', |
|
35 |
DeprecationWarning, |
|
36 |
r'bzrlib\.tests\.test_revision') |
|
37 |
||
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
38 |
# XXX: Make this a method of a merge base case
|
2696.3.3
by Martin Pool
Start setting the default format to dirstate-tags |
39 |
def make_branches(self, format=None): |
1392
by Robert Collins
reinstate testfetch test case |
40 |
"""Create two branches
|
41 |
||
42 |
branch 1 has 6 commits, branch 2 has 3 commits
|
|
1607.1.12
by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are |
43 |
commit 10 is a ghosted merge merge from branch 1
|
1392
by Robert Collins
reinstate testfetch test case |
44 |
|
45 |
the object graph is
|
|
46 |
B: A:
|
|
3830.3.23
by John Arbash Meinel
Use Branch.sprout rather than Branch.clone. |
47 |
a..0 a..0
|
1392
by Robert Collins
reinstate testfetch test case |
48 |
a..1 a..1
|
49 |
a..2 a..2
|
|
50 |
b..3 a..3 merges b..4
|
|
51 |
b..4 a..4
|
|
52 |
b..5 a..5 merges b..5
|
|
1092.2.26
by Robert Collins
fetch should work with ghosts |
53 |
b..6 merges a4
|
1392
by Robert Collins
reinstate testfetch test case |
54 |
|
55 |
so A is missing b6 at the start
|
|
56 |
and B is missing a3, a4, a5
|
|
57 |
"""
|
|
2696.3.3
by Martin Pool
Start setting the default format to dirstate-tags |
58 |
tree1 = self.make_branch_and_tree("branch1", format=format) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
59 |
br1 = tree1.branch |
3830.3.23
by John Arbash Meinel
Use Branch.sprout rather than Branch.clone. |
60 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
61 |
tree1.commit("Commit one", rev_id="a@u-0-0") |
62 |
tree1.commit("Commit two", rev_id="a@u-0-1") |
|
63 |
tree1.commit("Commit three", rev_id="a@u-0-2") |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
64 |
|
3830.3.23
by John Arbash Meinel
Use Branch.sprout rather than Branch.clone. |
65 |
tree2 = tree1.bzrdir.sprout("branch2").open_workingtree() |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
66 |
br2 = tree2.branch |
67 |
tree2.commit("Commit four", rev_id="b@u-0-3") |
|
68 |
tree2.commit("Commit five", rev_id="b@u-0-4") |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
69 |
revisions_2 = br2.revision_history() |
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
70 |
self.assertEquals(revisions_2[-1], 'b@u-0-4') |
3830.3.23
by John Arbash Meinel
Use Branch.sprout rather than Branch.clone. |
71 |
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
72 |
tree1.merge_from_branch(br2) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
73 |
tree1.commit("Commit six", rev_id="a@u-0-3") |
74 |
tree1.commit("Commit seven", rev_id="a@u-0-4") |
|
75 |
tree2.commit("Commit eight", rev_id="b@u-0-5") |
|
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
76 |
self.assertEquals(br2.revision_history()[-1], 'b@u-0-5') |
3830.3.23
by John Arbash Meinel
Use Branch.sprout rather than Branch.clone. |
77 |
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
78 |
tree1.merge_from_branch(br2) |
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
79 |
tree1.commit("Commit nine", rev_id="a@u-0-5") |
1908.6.7
by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly. |
80 |
# DO NOT MERGE HERE - we WANT a GHOST.
|
81 |
tree2.add_parent_tree_id(br1.revision_history()[4]) |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
82 |
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6") |
3830.3.23
by John Arbash Meinel
Use Branch.sprout rather than Branch.clone. |
83 |
|
974.1.26
by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472 |
84 |
return br1, br2 |
85 |
||
86 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
87 |
class TestIsAncestor(TestCaseWithTransport): |
88 |
||
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
89 |
def test_recorded_ancestry(self): |
90 |
"""Test that commit records all ancestors"""
|
|
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
91 |
br1, br2 = make_branches(self) |
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
92 |
d = [('a@u-0-0', ['a@u-0-0']), |
93 |
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']), |
|
94 |
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']), |
|
95 |
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']), |
|
1270
by Martin Pool
- fix recording of merged ancestry lines |
96 |
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', |
97 |
'b@u-0-4']), |
|
98 |
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', |
|
99 |
'a@u-0-3']), |
|
1271
by Martin Pool
- more commit ancestry tests |
100 |
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', |
101 |
'a@u-0-3', 'a@u-0-4']), |
|
102 |
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', |
|
103 |
'b@u-0-5']), |
|
104 |
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', |
|
105 |
'b@u-0-3', 'b@u-0-4', |
|
106 |
'b@u-0-5', 'a@u-0-5']), |
|
1392
by Robert Collins
reinstate testfetch test case |
107 |
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', |
1271
by Martin Pool
- more commit ancestry tests |
108 |
'b@u-0-3', 'b@u-0-4', |
109 |
'b@u-0-5', 'b@u-0-6']), |
|
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
110 |
]
|
1392
by Robert Collins
reinstate testfetch test case |
111 |
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5') |
112 |
br2_only = ('b@u-0-6',) |
|
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
113 |
for branch in br1, br2: |
114 |
for rev_id, anc in d: |
|
1392
by Robert Collins
reinstate testfetch test case |
115 |
if rev_id in br1_only and not branch is br1: |
116 |
continue
|
|
117 |
if rev_id in br2_only and not branch is br2: |
|
118 |
continue
|
|
1270
by Martin Pool
- fix recording of merged ancestry lines |
119 |
mutter('ancestry of {%s}: %r', |
1185.67.2
by Aaron Bentley
Renamed Branch.storage to Branch.repository |
120 |
rev_id, branch.repository.get_ancestry(rev_id)) |
121 |
result = sorted(branch.repository.get_ancestry(rev_id)) |
|
122 |
self.assertEquals(result, [None] + sorted(anc)) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
123 |
|
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
124 |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
125 |
class TestIntermediateRevisions(TestCaseWithTransport): |
1092.3.2
by Robert Collins
merge from baz2bzr |
126 |
|
127 |
def setUp(self): |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
128 |
TestCaseWithTransport.setUp(self) |
1185.16.145
by Martin Pool
Remove all assert statements from test cases. |
129 |
self.br1, self.br2 = make_branches(self) |
1508.1.19
by Robert Collins
Give format3 working trees their own last-revision marker. |
130 |
wt1 = self.br1.bzrdir.open_workingtree() |
131 |
wt2 = self.br2.bzrdir.open_workingtree() |
|
1534.4.36
by Robert Collins
Finish deprecating Branch.working_tree() |
132 |
wt2.commit("Commit eleven", rev_id="b@u-0-7") |
133 |
wt2.commit("Commit twelve", rev_id="b@u-0-8") |
|
134 |
wt2.commit("Commit thirtteen", rev_id="b@u-0-9") |
|
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
135 |
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
136 |
wt1.merge_from_branch(self.br2) |
1534.4.36
by Robert Collins
Finish deprecating Branch.working_tree() |
137 |
wt1.commit("Commit fourtten", rev_id="a@u-0-6") |
1268
by Martin Pool
- is_ancestor now works by looking at the Branch's stored ancestry |
138 |
|
1979.2.1
by Robert Collins
(robertc) adds a convenience method "merge_from_branch" to WorkingTree. |
139 |
wt2.merge_from_branch(self.br1) |
1534.4.36
by Robert Collins
Finish deprecating Branch.working_tree() |
140 |
wt2.commit("Commit fifteen", rev_id="b@u-0-10") |
1092.3.2
by Robert Collins
merge from baz2bzr |
141 |
|
974.2.7
by aaron.bentley at utoronto
Merged from bzr.24 |
142 |
|
1607.1.12
by Robert Collins
Fix common_ancestor to still calculate a common ancestor when ghosts are |
143 |
class MockRevisionSource(object): |
144 |
"""A RevisionSource that takes a pregenerated graph.
|
|
145 |
||
146 |
This is useful for testing revision graph algorithms where
|
|
147 |
the actual branch existing is irrelevant.
|
|
148 |
"""
|
|
149 |
||
150 |
def __init__(self, full_graph): |
|
151 |
self._full_graph = full_graph |
|
152 |
||
153 |
def get_revision_graph_with_ghosts(self, revision_ids): |
|
154 |
# This is mocked out to just return a constant graph.
|
|
155 |
return self._full_graph |
|
156 |
||
157 |
||
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
158 |
class TestCommonAncestor(TestCaseWithTransport): |
974.1.35
by aaron.bentley at utoronto
Added revision-based common-ancestor checking |
159 |
"""Test checking whether a revision is an ancestor of another revision"""
|
1092.1.39
by Robert Collins
merge from mpool |
160 |
|
1534.4.49
by Robert Collins
Provide a revision.get_history(repository) method for generating a synthetic revision history. |
161 |
def test_get_history(self): |
162 |
# TODO: test ghosts on the left hand branch's impact
|
|
163 |
# TODO: test ghosts on all parents, we should get some
|
|
164 |
# indicator. i.e. NULL_REVISION
|
|
165 |
# RBC 20060608
|
|
166 |
tree = self.make_branch_and_tree('.') |
|
167 |
tree.commit('1', rev_id = '1', allow_pointless=True) |
|
168 |
tree.commit('2', rev_id = '2', allow_pointless=True) |
|
169 |
tree.commit('3', rev_id = '3', allow_pointless=True) |
|
170 |
rev = tree.branch.repository.get_revision('1') |
|
171 |
history = rev.get_history(tree.branch.repository) |
|
172 |
self.assertEqual([None, '1'], history) |
|
173 |
rev = tree.branch.repository.get_revision('2') |
|
174 |
history = rev.get_history(tree.branch.repository) |
|
175 |
self.assertEqual([None, '1', '2'], history) |
|
176 |
rev = tree.branch.repository.get_revision('3') |
|
177 |
history = rev.get_history(tree.branch.repository) |
|
178 |
self.assertEqual([None, '1', '2' ,'3'], history) |
|
1594.2.3
by Robert Collins
bugfix revision.MultipleRevisionSources.get_revision_graph to integrate ghosts between sources. [slow on weaves, fast on knits. |
179 |
|
2229.2.3
by Aaron Bentley
change reserved_id to is_reserved_id, add check_not_reserved for DRY |
180 |
|
181 |
class TestReservedId(TestCase): |
|
182 |
||
183 |
def test_is_reserved_id(self): |
|
184 |
self.assertEqual(True, revision.is_reserved_id(NULL_REVISION)) |
|
185 |
self.assertEqual(True, revision.is_reserved_id( |
|
186 |
revision.CURRENT_REVISION)) |
|
187 |
self.assertEqual(True, revision.is_reserved_id('arch:')) |
|
188 |
self.assertEqual(False, revision.is_reserved_id('null')) |
|
189 |
self.assertEqual(False, revision.is_reserved_id( |
|
190 |
'arch:a@example.com/c--b--v--r')) |
|
191 |
self.assertEqual(False, revision.is_reserved_id(None)) |
|
2671.5.1
by Lukáš Lalinsky
Strip leading whitespace from the commit message before using the first line as a commit summary. |
192 |
|
193 |
||
194 |
class TestRevisionMethods(TestCase): |
|
195 |
||
196 |
def test_get_summary(self): |
|
197 |
r = revision.Revision('1') |
|
198 |
r.message = 'a' |
|
199 |
self.assertEqual('a', r.get_summary()) |
|
200 |
r.message = 'a\nb' |
|
201 |
self.assertEqual('a', r.get_summary()) |
|
202 |
r.message = '\na\nb' |
|
203 |
self.assertEqual('a', r.get_summary()) |
|
4398.10.1
by jszakmeister
Make Revision.get_summary() return an empty string when Revision.message is None, instead of backtracing. |
204 |
r.message = None |
205 |
self.assertEqual('', r.get_summary()) |
|
2671.5.2
by Lukáš Lalinsky
Add Revision.get_author to return the author's name, either from the property 'author' or the name of the committer. |
206 |
|
4056.2.1
by James Westby
Allow specifying multiple authors for a revision. |
207 |
def test_get_apparent_authors(self): |
208 |
r = revision.Revision('1') |
|
209 |
r.committer = 'A' |
|
210 |
self.assertEqual(['A'], r.get_apparent_authors()) |
|
211 |
r.properties['author'] = 'B' |
|
212 |
self.assertEqual(['B'], r.get_apparent_authors()) |
|
4056.2.3
by James Westby
Use a new "authors" revision property to allow multiple authors |
213 |
r.properties['authors'] = 'C\nD' |
214 |
self.assertEqual(['C', 'D'], r.get_apparent_authors()) |
|
4119.4.3
by Jonathan Lange
Add Revision.iter_bugs. |
215 |
|
4258.3.1
by Jelmer Vernooij
Cope with revision.committer being None. |
216 |
def test_get_apparent_authors_no_committer(self): |
217 |
r = revision.Revision('1') |
|
218 |
self.assertEqual([], r.get_apparent_authors()) |
|
219 |
||
4119.4.3
by Jonathan Lange
Add Revision.iter_bugs. |
220 |
|
221 |
class TestRevisionBugs(TestCase): |
|
222 |
"""Tests for getting the bugs that a revision is linked to."""
|
|
223 |
||
224 |
def test_no_bugs(self): |
|
225 |
r = revision.Revision('1') |
|
226 |
self.assertEqual([], list(r.iter_bugs())) |
|
227 |
||
228 |
def test_some_bugs(self): |
|
229 |
r = revision.Revision( |
|
230 |
'1', properties={ |
|
231 |
'bugs': bugtracker.encode_fixes_bug_urls( |
|
232 |
['http://example.com/bugs/1', |
|
233 |
'http://launchpad.net/bugs/1234'])}) |
|
234 |
self.assertEqual( |
|
235 |
[('http://example.com/bugs/1', bugtracker.FIXED), |
|
236 |
('http://launchpad.net/bugs/1234', bugtracker.FIXED)], |
|
237 |
list(r.iter_bugs())) |
|
238 |
||
239 |
def test_no_status(self): |
|
240 |
r = revision.Revision( |
|
241 |
'1', properties={'bugs': 'http://example.com/bugs/1'}) |
|
242 |
self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs()) |
|
243 |
||
244 |
def test_too_much_information(self): |
|
245 |
r = revision.Revision( |
|
246 |
'1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'}) |
|
247 |
self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs()) |
|
248 |
||
249 |
def test_invalid_status(self): |
|
250 |
r = revision.Revision( |
|
251 |
'1', properties={'bugs': 'http://example.com/bugs/1 faxed'}) |
|
252 |
self.assertRaises(InvalidBugStatus, list, r.iter_bugs()) |