~bzr-pqm/bzr/bzr.dev

2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
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
16
17
"""Tests for reconiliation behaviour that is repository independent."""
18
19
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
20
from bzrlib import bzrdir, errors, tests
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
21
from bzrlib.reconcile import reconcile, Reconciler
22
from bzrlib.revision import Revision
23
from bzrlib.tests.repository_implementations.test_repository import TestCaseWithRepository
24
from bzrlib.transport import get_transport
25
from bzrlib.workingtree import WorkingTree
26
27
28
class TestWorksWithSharedRepositories(TestCaseWithRepository):
29
30
    def test_reweave_empty(self):
31
        # we want a repo capable format
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
32
        parent = bzrdir.BzrDirMetaFormat1().initialize('.')
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
33
        parent.create_repository(shared=True)
34
        parent.root_transport.mkdir('child')
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
35
        child = bzrdir.BzrDirMetaFormat1().initialize('child')
1570.1.11 by Robert Collins
Make reconcile work with shared repositories.
36
        self.assertRaises(errors.NoRepositoryPresent, child.open_repository)
37
        reconciler = Reconciler(child)
38
        reconciler.reconcile()
39
        # smoke test for reconcile appears to work too.
40
        reconcile(child)
41
        # no inconsistent parents should have been found
42
        # but the values should have been set.
43
        self.assertEqual(0, reconciler.inconsistent_parents)
44
        # and no garbage inventories
45
        self.assertEqual(0, reconciler.garbage_inventories)
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
46
47
48
class TestReconciler(tests.TestCaseWithTransport):
49
    
50
    def test_reconciler_with_no_branch(self):
51
        repo = self.make_repository('repo')
52
        reconciler = Reconciler(repo.bzrdir)
3389.2.8 by John Arbash Meinel
Update some tests to pass with the branch checks.
53
        reconciler.reconcile()
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
54
        # no inconsistent parents should have been found
55
        # but the values should have been set.
56
        self.assertEqual(0, reconciler.inconsistent_parents)
57
        # and no garbage inventories
58
        self.assertEqual(0, reconciler.garbage_inventories)
3389.2.8 by John Arbash Meinel
Update some tests to pass with the branch checks.
59
        self.assertIs(None, reconciler.fixed_branch_history)
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
60
61
    def test_reconciler_finds_branch(self):
62
        a_branch = self.make_branch('a_branch')
63
        reconciler = Reconciler(a_branch.bzrdir)
3389.2.8 by John Arbash Meinel
Update some tests to pass with the branch checks.
64
        reconciler.reconcile()
3389.2.3 by John Arbash Meinel
Add Branch.reconcile() functionality.
65
66
        # It should have checked the repository, and the branch
67
        self.assertEqual(0, reconciler.inconsistent_parents)
68
        self.assertEqual(0, reconciler.garbage_inventories)
69
        self.assertIs(False, reconciler.fixed_branch_history)