/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 14:26:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105142658-vek3v6pzlxb751s2
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. 

@only_raises is evil and gave a hard time since any exception during
save_changes() was swallowed.

Possible improvements: 

- add some needs_write_lock decorators to crucial
  methods (_set_config_location ?) but keep locking the branch at higher levels

- decorate branch.unlock to call stack.save if last_lock() it True
  outside of @only_raises scope (evil decorator)

- add @needs_write_lock to stack.set and stack.remove (will probably get
  rid of most testing issues) we probably need a specialized decorator
  that can relay to the store and from there to the branch or whatever is
  needed. This will also helps bzr config to get it right. The
  get_mutable_section trick should not be needed anymore either.

- decorate branch.unlock to call stack.save if last_lock() it True outside
  of @only_raises scope (evil decorator)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
1
 
# Copyright (C) 2005, 2007 Canonical Ltd
 
1
# Copyright (C) 2005-2009, 2011 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from cStringIO import StringIO
19
 
import os
20
 
import sys
21
 
 
 
18
from bzrlib.branchbuilder import BranchBuilder
22
19
from bzrlib.tests import TestCaseWithMemoryTransport
23
 
from bzrlib.branch import Branch
24
 
from bzrlib.branchbuilder import BranchBuilder
 
20
from bzrlib.tests.matchers import MatchesAncestry
25
21
 
26
22
 
27
23
class TestAncestry(TestCaseWithMemoryTransport):
28
24
 
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
25
    def test_straightline_ancestry(self):
35
26
        """Test ancestry file when just committing."""
36
27
        builder = BranchBuilder(self.get_transport())
37
28
        rev_id_one = builder.build_commit()
38
29
        rev_id_two = builder.build_commit()
39
30
        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)
 
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))
43
35
 
44
36
# TODO: check that ancestry is updated to include indirectly merged revisions