~bzr-pqm/bzr/bzr.dev

1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1
# Copyright (C) 2005 by Canonical Ltd
2
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.
7
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.
12
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
17
import sys
18
import os
19
20
from cStringIO import StringIO
21
22
from bzrlib.selftest import TestCase, TestCaseInTempDir
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
27
class TestAncestry(TestCaseInTempDir):
1390 by Robert Collins
pair programming worx... merge integration and weave
28
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
29
    def test_straightline_ancestry(self):
30
        """Test ancestry file when just committing."""
1390 by Robert Collins
pair programming worx... merge integration and weave
31
        b = Branch.initialize('.')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
32
33
        b.commit(message='one',
34
                 allow_pointless=True,
35
                 rev_id='tester@foo--1')
36
37
        b.commit(message='two',
38
                 allow_pointless=True,
39
                 rev_id='tester@foo--2')
40
41
        ancs = b.get_ancestry('tester@foo--2')
1415 by Robert Collins
remove the ancestry weave file
42
        self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs)
43
        self.assertEqual([None, 'tester@foo--1'], 
44
                         b.get_ancestry('tester@foo--1'))
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
45
1390 by Robert Collins
pair programming worx... merge integration and weave
46
    def test_none_is_always_an_ancestor(self):
47
        b = Branch.initialize('.')
48
        # note this is tested before any commits are done.
49
        self.assertEqual(True, is_ancestor(None, None, b))
50
        b.commit(message='one',
51
                 allow_pointless=True,
52
                 rev_id='tester@foo--1')
53
        self.assertEqual(True, is_ancestor(None, None, b))
54
        self.assertEqual(True, is_ancestor('tester@foo--1', None, b))
55
        self.assertEqual(False, is_ancestor(None, 'tester@foo--1', b))
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