← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

(gz) Fix test failure on alpha by correcting format string for
 gc_chk_sha1_record (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
86
86
class SmartServerRequestBzrDir(SmartServerRequest):
87
87
 
88
88
    def do(self, path, *args):
89
 
        """Open a BzrDir at path, and return `self.do_bzrdir_request(*args)`."""
 
89
        """Open a BzrDir at path, and return self.do_bzrdir_request(*args)."""
90
90
        try:
91
91
            self._bzrdir = BzrDir.open_from_transport(
92
92
                self.transport_from_client_path(path))
150
150
        control_format = self._bzrdir.cloning_metadir(
151
151
            require_stacking=require_stacking)
152
152
        control_name = control_format.network_name()
153
 
        if not control_format.fixed_components:
 
153
        # XXX: There should be a method that tells us that the format does/does
 
154
        # not have subformats.
 
155
        if isinstance(control_format, BzrDirMetaFormat1):
154
156
            branch_name = ('branch',
155
157
                control_format.get_branch_format().network_name())
156
158
            repository_name = control_format.repository_format.network_name()
179
181
 
180
182
        :param path: The path to the bzrdir.
181
183
        :param network_name: The network name of the branch type to create.
182
 
        :return: ('ok', branch_format, repo_path, rich_root, tree_ref,
183
 
            external_lookup, repo_format)
 
184
        :return: (ok, network_name)
184
185
        """
185
186
        bzrdir = BzrDir.open_from_transport(
186
187
            self.transport_from_client_path(path))