← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
31
31
    revision as _mod_revision,
32
32
    transport as _mod_transport,
33
33
    ui,
 
34
    urlutils,
34
35
    )
35
36
from bzrlib.push import (
36
37
    PushResult,
193
194
        """
194
195
        raise NotImplementedError(self.destroy_workingtree_metadata)
195
196
 
 
197
    def find_branch_format(self, name=None):
 
198
        """Find the branch 'format' for this bzrdir.
 
199
 
 
200
        This might be a synthetic object for e.g. RemoteBranch and SVN.
 
201
        """
 
202
        raise NotImplementedError(self.find_branch_format)
 
203
 
196
204
    def get_branch_reference(self, name=None):
197
205
        """Return the referenced URL for the branch in this controldir.
198
206
 
266
274
        except errors.NotBranchError:
267
275
            return False
268
276
 
 
277
    def _get_selected_branch(self):
 
278
        """Return the name of the branch selected by the user.
 
279
 
 
280
        :return: Name of the branch selected by the user, or None.
 
281
        """
 
282
        branch = self.root_transport.get_segment_parameters().get("branch")
 
283
        if branch is not None:
 
284
            branch = urlutils.unescape(branch)
 
285
        return branch
 
286
 
269
287
    def has_workingtree(self):
270
288
        """Tell if this controldir contains a working tree.
271
289