~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/builtins.py

Committer: Patch Queue Manager
Date: 2012-01-31 16:10:49 UTC
mfrom: (6437.22.5 destroy-no-such-branch)
mto: (6437.54.1 2.5) (6457.1.1 trunk) (6159.2.7 bzr) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6458.
Revision ID: pqm@pqm.ubuntu.com-20120131161049-cz8sy2sy2g0vk356

(jelmer) Raise NotBranchError from BzrDir.destroy_branch. (Jelmer Vernooij)

added added

removed removed

6454

def run(self, location=None):

6455

if location is None:

6456

location = "."

6457

branch = Branch.open_containing(location)[0]

6458

branch.bzrdir.destroy_branch()

6457

cdir = controldir.ControlDir.open_containing(location)[0]

6458

cdir.destroy_branch()

6459

6460

6461

class cmd_shelve(Command):