/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-06 11:36:02 UTC
  • mfrom: (6462 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6463.
  • Revision ID: jelmer@samba.org-20120206113602-yu3j0xe7qbk1szw9
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2789
2789
            self.add_cleanup(b.lock_read().unlock)
2790
2790
            rev1, rev2 = _get_revision_range(revision, b, self.name())
2791
2791
 
2792
 
        if b.get_config().validate_signatures_in_log():
 
2792
        if b.get_config_stack().get('validate_signatures_in_log'):
2793
2793
            signatures = True
2794
2794
 
2795
2795
        if signatures:
6452
6452
    def run(self, location=None):
6453
6453
        if location is None:
6454
6454
            location = "."
6455
 
        branch = Branch.open_containing(location)[0]
6456
 
        branch.bzrdir.destroy_branch()
 
6455
        cdir = controldir.ControlDir.open_containing(location)[0]
 
6456
        cdir.destroy_branch()
6457
6457
 
6458
6458
 
6459
6459
class cmd_shelve(Command):