1
# Copyright (C) 2005 by Canonical Ltd
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.
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.
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
20
from cStringIO import StringIO
22
from bzrlib.tests import TestCase, TestCaseInTempDir
23
from bzrlib.branch import Branch
24
from bzrlib.revision import is_ancestor
27
class TestAncestry(TestCaseInTempDir):
29
def test_straightline_ancestry(self):
30
"""Test ancestry file when just committing."""
31
b = Branch.initialize(u'.')
34
wt.commit(message='one',
36
rev_id='tester@foo--1')
38
wt.commit(message='two',
40
rev_id='tester@foo--2')
42
ancs = b.get_ancestry('tester@foo--2')
43
self.assertEqual([None, 'tester@foo--1', 'tester@foo--2'], ancs)
44
self.assertEqual([None, 'tester@foo--1'],
45
b.get_ancestry('tester@foo--1'))
47
def test_none_is_always_an_ancestor(self):
48
b = Branch.initialize(u'.')
49
# note this is tested before any commits are done.
50
self.assertEqual(True, is_ancestor(None, None, b))
52
wt.commit(message='one',
54
rev_id='tester@foo--1')
55
self.assertEqual(True, is_ancestor(None, None, b))
56
self.assertEqual(True, is_ancestor('tester@foo--1', None, b))
57
self.assertEqual(False, is_ancestor(None, 'tester@foo--1', b))
60
# TODO: check that ancestry is updated to include indirectly merged revisions
added
removed
bzrlib/tests/test_ancestry.py
