← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-04 12:10:51 UTC
  • mfrom: (5819.1.4 777007-developer-doc)
  • Revision ID: pqm@pqm.ubuntu.com-20110504121051-aovlsmqiivjmc4fc
(jelmer) Small fixes to developer documentation. (Jonathan Riddell)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2009, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
 
17
 
 
18
 
from cStringIO import StringIO
19
 
import os
20
 
import sys
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
21
17
 
22
18
from bzrlib.tests import TestCaseWithMemoryTransport
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.revision import is_ancestor
 
19
from bzrlib.branchbuilder import BranchBuilder
25
20
 
26
21
 
27
22
class TestAncestry(TestCaseWithMemoryTransport):
33
28
 
34
29
    def test_straightline_ancestry(self):
35
30
        """Test ancestry file when just committing."""
36
 
        tree = self.make_branch_and_memory_tree('.')
37
 
        branch = tree.branch
38
 
        tree.lock_write()
39
 
        tree.add('')
40
 
        rev_id_one = tree.commit('one')
41
 
        rev_id_two = tree.commit('two', allow_pointless=True)
42
 
        tree.unlock()
43
 
 
 
31
        builder = BranchBuilder(self.get_transport())
 
32
        rev_id_one = builder.build_commit()
 
33
        rev_id_two = builder.build_commit()
 
34
        branch = builder.get_branch()
44
35
        self.assertAncestryEqual([None, rev_id_one, rev_id_two],
45
36
            rev_id_two, branch)
46
37
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
47
38
 
48
 
    def test_none_is_always_an_ancestor(self):
49
 
        tree = self.make_branch_and_memory_tree('.')
50
 
        tree.lock_write()
51
 
        tree.add('')
52
 
        # note this is tested before any commits are done.
53
 
        self.assertTrue(is_ancestor(None, None, tree.branch))
54
 
        rev_id = tree.commit('one')
55
 
        tree.unlock()
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))
59
 
 
60
 
 
61
39
# TODO: check that ancestry is updated to include indirectly merged revisions