← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

Merge bzr.dev and tree-file-ids-as-tuples.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
116
116
        :return: Dictionary mapping branch names to instances.
117
117
        """
118
118
        try:
119
 
           return { None: self.open_branch() }
 
119
           return { "": self.open_branch() }
120
120
        except (errors.NotBranchError, errors.NoRepositoryPresent):
121
121
           return {}
122
122
 
230
230
            raise errors.NoColocatedBranchSupport(self)
231
231
        return None
232
232
 
 
233
    def set_branch_reference(self, target_branch, name=None):
 
234
        """Set the referenced URL for the branch in this controldir.
 
235
 
 
236
        :param name: Optional colocated branch name
 
237
        :param target_branch: Branch to reference
 
238
        :raises NoColocatedBranchSupport: If a branch name was specified
 
239
            but colocated branches are not supported.
 
240
        :return: The referencing branch
 
241
        """
 
242
        raise NotImplementedError(self.set_branch_reference)
 
243
 
233
244
    def open_branch(self, name=None, unsupported=False,
234
245
                    ignore_fallbacks=False, possible_transports=None):
235
246
        """Open the branch object at this ControlDir if one is present.
294
305
        :return: Name of the branch selected by the user, or None.
295
306
        """
296
307
        branch = self.root_transport.get_segment_parameters().get("branch")
297
 
        if branch is not None:
298
 
            branch = urlutils.unescape(branch)
299
 
        return branch
 
308
        if branch is None:
 
309
            branch = ""
 
310
        return urlutils.unescape(branch)
300
311
 
301
312
    def has_workingtree(self):
302
313
        """Tell if this controldir contains a working tree.