~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

• browse files at revision 4494
• compare with another revision
• download diff
• download tarball
• view history from revision 4494

• reverse the comparison (4494 to 1216)
• stop comparing with revision 1216

Show diffs side-by-side

added

removed

bzrlib/tests/test_ancestry.py

 

1

# Copyright (C) 2005, 2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

 

16

 

 

17

 

 

18

from cStringIO import StringIO

 

19

import os

 

20

import sys

 

21

 

 

22

from bzrlib.tests import TestCaseWithMemoryTransport

 

23

from bzrlib.branch import Branch

 

24

from bzrlib.branchbuilder import BranchBuilder

 

25

 

 

26

 

 

27

class TestAncestry(TestCaseWithMemoryTransport):

 

28

 

 

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

 

 

34

    def test_straightline_ancestry(self):

 

35

        """Test ancestry file when just committing."""

 

36

        builder = BranchBuilder(self.get_transport())

 

37

        rev_id_one = builder.build_commit()

 

38

        rev_id_two = builder.build_commit()

 

39

        branch = builder.get_branch()

 

40

        self.assertAncestryEqual([None, rev_id_one, rev_id_two],

 

41

            rev_id_two, branch)

 

42

        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)

 

43

 

 

44

# TODO: check that ancestry is updated to include indirectly merged revisions

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1