~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/__init__.py

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
from bzrlib import (
26
26
    branchbuilder,
27
27
    tests,
28
 
    transport,
29
28
    workingtree,
30
29
    )
31
 
from bzrlib.transport import memory
32
 
from bzrlib.tests import (
33
 
    per_controldir,
34
 
    test_server,
35
 
    )
36
 
 
37
 
 
38
 
def make_scenarios(transport_server, transport_readonly_server, formats,
39
 
                   remote_server=None, remote_readonly_server=None,
40
 
                   remote_backing_server=None):
 
30
from bzrlib.tests import per_controldir
 
31
 
 
32
 
 
33
def make_scenarios(transport_server, transport_readonly_server, formats):
41
34
    result = []
42
35
    for workingtree_format in formats:
43
36
        result.append((workingtree_format.__class__.__name__,
44
37
                       make_scenario(transport_server,
45
38
                                     transport_readonly_server,
46
39
                                     workingtree_format)))
47
 
    default_wt_format = workingtree.format_registry.get_default()
48
 
    if remote_server is None:
49
 
        remote_server = test_server.SmartTCPServer_for_testing
50
 
    if remote_readonly_server is None:
51
 
        remote_readonly_server = test_server.ReadonlySmartTCPServer_for_testing
52
 
    if remote_backing_server is None:
53
 
        remote_backing_server = memory.MemoryServer
54
 
    scenario = make_scenario(remote_server, remote_readonly_server,
55
 
                             default_wt_format)
56
 
    scenario['repo_is_remote'] = True;
57
 
    scenario['vfs_transport_factory'] = remote_backing_server
58
 
    result.append((default_wt_format.__class__.__name__ + ',remote', scenario))
59
40
    return result
60
41
 
61
42
 
90
71
    def make_branch_and_tree(self, relpath, format=None):
91
72
        made_control = self.make_bzrdir(relpath, format=format)
92
73
        made_control.create_repository()
93
 
        b = made_control.create_branch()
94
 
        if getattr(self, 'repo_is_remote', False):
95
 
            # If the repo is remote, then we just create a local lightweight
96
 
            # checkout
97
 
            # XXX: This duplicates a lot of Branch.create_checkout, but we know
98
 
            #      we want a) lightweight, and b) a specific WT format. We also
99
 
            #      know that nothing should already exist, etc.
100
 
            t = transport.get_transport(relpath)
101
 
            t.ensure_base()
102
 
            bzrdir_format = self.workingtree_format.get_controldir_for_branch()
103
 
            wt_dir = bzrdir_format.initialize_on_transport(t)
104
 
            branch_ref = wt_dir.set_branch_reference(b)
105
 
            wt = wt_dir.create_workingtree(None, from_branch=branch_ref)
106
 
        else:
107
 
            wt = self.workingtree_format.initialize(made_control)
108
 
        return wt
 
74
        made_control.create_branch()
 
75
        return self.workingtree_format.initialize(made_control)
109
76
 
110
77
    def make_branch_builder(self, relpath, format=None):
111
78
        if format is None: