← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Martin Pool
  • Date: 2011-07-04 22:04:55 UTC
  • mto: This revision was merged to the branch mainline in revision 6017.
  • Revision ID: mbp@canonical.com-20110704220455-1y5wa5akhuc9zq6h
Clean up transport tests to use addCleanup

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,
35
34
    )
36
35
from bzrlib.push import (
37
36
    PushResult,
194
193
        """
195
194
        raise NotImplementedError(self.destroy_workingtree_metadata)
196
195
 
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
 
 
204
196
    def get_branch_reference(self, name=None):
205
197
        """Return the referenced URL for the branch in this controldir.
206
198
 
274
266
        except errors.NotBranchError:
275
267
            return False
276
268
 
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
 
 
287
269
    def has_workingtree(self):
288
270
        """Tell if this controldir contains a working tree.
289
271