← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconcile.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconcile.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2008, 2009, 2010 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for reconiliation behaviour that is repository independent."""
18
18
 
19
19
 
20
 
from bzrlib import bzrdir, errors, tests
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    errors,
 
23
    tests,
 
24
    )
21
25
from bzrlib.reconcile import reconcile, Reconciler
22
26
from bzrlib.revision import Revision
23
 
from bzrlib.tests.per_repository import TestCaseWithRepository
24
 
from bzrlib.transport import get_transport
 
27
from bzrlib.tests import per_repository
25
28
from bzrlib.workingtree import WorkingTree
26
29
 
27
30
 
28
 
class TestWorksWithSharedRepositories(TestCaseWithRepository):
 
31
class TestWorksWithSharedRepositories(per_repository.TestCaseWithRepository):
29
32
 
30
33
    def test_reweave_empty(self):
31
34
        # we want a repo capable format
46
49
 
47
50
 
48
51
class TestReconciler(tests.TestCaseWithTransport):
49
 
    
 
52
 
50
53
    def test_reconciler_with_no_branch(self):
51
54
        repo = self.make_repository('repo')
52
55
        reconciler = Reconciler(repo.bzrdir)