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 |
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
26 |
|
27 |
||
1986.4.4
by Robert Collins
Merge from TestCaseWithMemoryTransport. |
28 |
class TestAncestry(TestCaseWithMemoryTransport): |
1390
by Robert Collins
pair programming worx... merge integration and weave |
29 |
|
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. |
30 |
def assertAncestryEqual(self, expected, revision_id, branch): |
31 |
"""Assert that the ancestry of revision_id in branch is as expected."""
|
|
32 |
ancestry = branch.repository.get_ancestry(revision_id) |
|
33 |
self.assertEqual(expected, ancestry) |
|
34 |
||
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
35 |
def test_straightline_ancestry(self): |
36 |
"""Test ancestry file when just committing."""
|
|
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
37 |
builder = BranchBuilder(self.get_transport()) |
38 |
rev_id_one = builder.build_commit() |
|
39 |
rev_id_two = builder.build_commit() |
|
40 |
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. |
41 |
self.assertAncestryEqual([None, rev_id_one, rev_id_two], |
42 |
rev_id_two, branch) |
|
43 |
self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch) |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
44 |
|
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
45 |
def test_none_is_ancestor_empty_branch(self): |
46 |
branch = self.make_branch('.') |
|
2598.5.3
by Aaron Bentley
Push NULL_REVISION deeper |
47 |
self.assertTrue(is_ancestor('null:', 'null:', branch)) |
2466.10.1
by Robert Collins
Use BranchBuilder in test_ancestry. |
48 |
|
49 |
def test_none_is_ancestor_non_empty_branch(self): |
|
50 |
builder = BranchBuilder(self.get_transport()) |
|
51 |
rev_id = builder.build_commit() |
|
52 |
branch = builder.get_branch() |
|
2598.5.3
by Aaron Bentley
Push NULL_REVISION deeper |
53 |
self.assertTrue(is_ancestor('null:', 'null:', branch)) |
54 |
self.assertTrue(is_ancestor(rev_id, 'null:', branch)) |
|
55 |
self.assertFalse(is_ancestor('null:', rev_id, branch)) |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
56 |
|
57 |
||
58 |
# TODO: check that ancestry is updated to include indirectly merged revisions
|