2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2005 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 |
1390
by Robert Collins
pair programming worx... merge integration and weave |
24 |
from bzrlib.revision import is_ancestor |
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
25 |
|
26 |
||
1986.4.4
by Robert Collins
Merge from TestCaseWithMemoryTransport. |
27 |
class TestAncestry(TestCaseWithMemoryTransport): |
1390
by Robert Collins
pair programming worx... merge integration and weave |
28 |
|
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. |
29 |
def assertAncestryEqual(self, expected, revision_id, branch): |
30 |
"""Assert that the ancestry of revision_id in branch is as expected."""
|
|
31 |
ancestry = branch.repository.get_ancestry(revision_id) |
|
32 |
self.assertEqual(expected, ancestry) |
|
33 |
||
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
34 |
def test_straightline_ancestry(self): |
35 |
"""Test ancestry file when just committing."""
|
|
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. |
36 |
tree = self.make_branch_and_memory_tree('.') |
37 |
branch = tree.branch |
|
1731.1.63
by Aaron Bentley
Avoid committing with None root in test_straightline_ancestry |
38 |
tree.lock_write() |
39 |
tree.add('') |
|
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. |
40 |
rev_id_one = tree.commit('one') |
41 |
rev_id_two = tree.commit('two', allow_pointless=True) |
|
1731.1.63
by Aaron Bentley
Avoid committing with None root in test_straightline_ancestry |
42 |
tree.unlock() |
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. |
43 |
|
44 |
self.assertAncestryEqual([None, rev_id_one, rev_id_two], |
|
45 |
rev_id_two, branch) |
|
46 |
self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch) |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
47 |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
48 |
def test_none_is_always_an_ancestor(self): |
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. |
49 |
tree = self.make_branch_and_memory_tree('.') |
1731.1.64
by Aaron Bentley
Fix up more memorytree tests |
50 |
tree.lock_write() |
51 |
tree.add('') |
|
1390
by Robert Collins
pair programming worx... merge integration and weave |
52 |
# note this is tested before any commits are done.
|
1986.4.8
by Robert Collins
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,... |
53 |
self.assertTrue(is_ancestor(None, None, tree.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. |
54 |
rev_id = tree.commit('one') |
1731.1.64
by Aaron Bentley
Fix up more memorytree tests |
55 |
tree.unlock() |
1986.4.8
by Robert Collins
(Robert Collins, John Meinel) Change test_ancestry to use assertTrue and assertFalse over assertEqual(True,... |
56 |
self.assertTrue(is_ancestor(None, None, tree.branch)) |
57 |
self.assertTrue(is_ancestor(rev_id, None, tree.branch)) |
|
58 |
self.assertFalse(is_ancestor(None, rev_id, tree.branch)) |
|
1225
by Martin Pool
- branch now tracks ancestry - all merged revisions |
59 |
|
60 |
||
61 |
# TODO: check that ancestry is updated to include indirectly merged revisions
|