bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
1 |
# Copyright (C) 2005, 2007 Canonical Ltd
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
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 |
#
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
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 |
#
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
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 |
||
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
17 |
|
18 |
from cStringIO import StringIO |
|
19 |
import os |
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
20 |
import sys |
|
1534.4.26
by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create. |
21 |
|
|
1986.4.4
by Robert Collins
Merge from TestCaseWithMemoryTransport. |
22 |
from bzrlib.tests import TestCaseWithMemoryTransport |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
23 |
from bzrlib.branch import Branch |
|
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
24 |
from bzrlib.branchbuilder import BranchBuilder |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
25 |
from bzrlib.revision import is_ancestor |
|
3123.1.1
by John Arbash Meinel
Update from deprecating 0.93 to 1.0, and add a 1.1 deprecation. |
26 |
from bzrlib.symbol_versioning import one_zero |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
27 |
|
28 |
||
|
1986.4.4
by Robert Collins
Merge from TestCaseWithMemoryTransport. |
29 |
class TestAncestry(TestCaseWithMemoryTransport): |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
30 |
|
|
1986.4.2
by Robert Collins
25/home/robertc/source/baz/test-performance/bzrlib/tests/test_ancestry.py performance win for tests in test_ancestry.py. |
31 |
def assertAncestryEqual(self, expected, revision_id, branch): |
32 |
"""Assert that the ancestry of revision_id in branch is as expected.""" |
|
33 |
ancestry = branch.repository.get_ancestry(revision_id) |
|
34 |
self.assertEqual(expected, ancestry) |
|
35 |
||
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
36 |
def test_straightline_ancestry(self): |
37 |
"""Test ancestry file when just committing.""" |
|
|
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
38 |
builder = BranchBuilder(self.get_transport()) |
39 |
rev_id_one = builder.build_commit() |
|
40 |
rev_id_two = builder.build_commit() |
|
41 |
branch = builder.get_branch() |
|
|
1986.4.2
by Robert Collins
25/home/robertc/source/baz/test-performance/bzrlib/tests/test_ancestry.py performance win for tests in test_ancestry.py. |
42 |
self.assertAncestryEqual([None, rev_id_one, rev_id_two], |
43 |
rev_id_two, branch) |
|
44 |
self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch) |
|
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
45 |
|
|
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
46 |
def test_none_is_ancestor_empty_branch(self): |
47 |
branch = self.make_branch('.') |
|
|
3123.1.1
by John Arbash Meinel
Update from deprecating 0.93 to 1.0, and add a 1.1 deprecation. |
48 |
self.assertTrue(self.applyDeprecated(one_zero, |
|
3052.1.3
by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests. |
49 |
is_ancestor, 'null:', 'null:', branch)) |
|
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
50 |
|
51 |
def test_none_is_ancestor_non_empty_branch(self): |
|
52 |
builder = BranchBuilder(self.get_transport()) |
|
53 |
rev_id = builder.build_commit() |
|
54 |
branch = builder.get_branch() |
|
|
3052.1.2
by John Arbash Meinel
Pack repositories need to be explicitly locked for graph().is_ancestor to work. |
55 |
branch.lock_read() |
56 |
self.addCleanup(branch.unlock) |
|
|
3123.1.1
by John Arbash Meinel
Update from deprecating 0.93 to 1.0, and add a 1.1 deprecation. |
57 |
self.assertTrue(self.applyDeprecated(one_zero, |
|
3052.1.3
by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests. |
58 |
is_ancestor, 'null:', 'null:', branch)) |
|
3123.1.1
by John Arbash Meinel
Update from deprecating 0.93 to 1.0, and add a 1.1 deprecation. |
59 |
self.assertTrue(self.applyDeprecated(one_zero, |
|
3052.1.3
by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests. |
60 |
is_ancestor, rev_id, 'null:', branch)) |
|
3123.1.1
by John Arbash Meinel
Update from deprecating 0.93 to 1.0, and add a 1.1 deprecation. |
61 |
self.assertFalse(self.applyDeprecated(one_zero, |
|
3052.1.3
by John Arbash Meinel
deprecate revision.is_ancestor, update the callers and the tests. |
62 |
is_ancestor, 'null:', rev_id, branch)) |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
63 |
|
64 |
||
65 |
# TODO: check that ancestry is updated to include indirectly merged revisions
|