/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

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

• reverse the comparison (2425.1.1 to 5830.2.1)
• stop comparing with revision 5830.2.1

Show diffs side-by-side

added

removed

bzrlib/tests/test_ancestry.py

1

 

# Copyright (C) 2005-2009, 2011 Canonical Ltd

 

1

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

16

 

 

 

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

17

21

 

18

22

from bzrlib.tests import TestCaseWithMemoryTransport

19

 

from bzrlib.branchbuilder import BranchBuilder

 

23

from bzrlib.branch import Branch

 

24

from bzrlib.revision import is_ancestor

20

25

 

21

26

 

22

27

class TestAncestry(TestCaseWithMemoryTransport):

28

33

 

29

34

    def test_straightline_ancestry(self):

30

35

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

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()

 

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

 

35

44

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

36

45

            rev_id_two, branch)

37

46

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

38

47

 

 

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

 

39

61

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

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0