← 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: Jelmer Vernooij
  • Date: 2008-07-08 15:58:12 UTC
  • mfrom: (3353.1.4 paramiko-1.7.2-compat)
  • mto: This revision was merged to the branch mainline in revision 3531.
  • Revision ID: jelmer@samba.org-20080708155812-gacwrgs7d7n48a0d
Merge bashprompt script that prints the bzr branch nick.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
1
 
# Copyright (C) 2005-2009, 2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2007 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
 
 
17
 
 
 
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
 
21
 
 
22
from bzrlib.tests import TestCaseWithMemoryTransport
 
23
from bzrlib.branch import Branch
18
24
from bzrlib.branchbuilder import BranchBuilder
19
 
from bzrlib.tests import TestCaseWithMemoryTransport
20
 
from bzrlib.tests.matchers import MatchesAncestry
21
25
 
22
26
 
23
27
class TestAncestry(TestCaseWithMemoryTransport):
24
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
 
25
34
    def test_straightline_ancestry(self):
26
35
        """Test ancestry file when just committing."""
27
36
        builder = BranchBuilder(self.get_transport())
28
37
        rev_id_one = builder.build_commit()
29
38
        rev_id_two = builder.build_commit()
30
39
        branch = builder.get_branch()
31
 
        self.assertThat([rev_id_one, rev_id_two],
32
 
            MatchesAncestry(branch.repository, rev_id_two))
33
 
        self.assertThat([rev_id_one],
34
 
            MatchesAncestry(branch.repository, rev_id_one))
 
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)
35
43
 
36
44
# TODO: check that ancestry is updated to include indirectly merged revisions