/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 breezy/errors.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/errors.py
659
659
       if detail is not None:
660
660
           detail = ': ' + detail
661
661
       self.detail = detail
662
 
       self.bzrdir = bzrdir
 
662
       self.controldir = bzrdir
663
663
       PathError.__init__(self, path=path)
664
664
 
665
665
    def __repr__(self):
670
670
        # Python 2.4 have to be old-style classes so properties don't work.
671
671
        # Instead we override _format.
672
672
        if self.detail is None:
673
 
            if self.bzrdir is not None:
 
673
            if self.controldir is not None:
674
674
                try:
675
 
                    self.bzrdir.open_repository()
 
675
                    self.controldir.open_repository()
676
676
                except NoRepositoryPresent:
677
677
                    self.detail = ''
678
678
                except Exception:
779
779
    def __init__(self, format, bzrdir_format):
780
780
        BzrError.__init__(self)
781
781
        self.format = format
782
 
        self.bzrdir = bzrdir_format
 
782
        self.controldir = bzrdir_format
783
783
 
784
784
 
785
785
class ParseFormatError(BzrError):
3202
3202
    _fmt = ("%(bzrdir)r does not support co-located branches.")
3203
3203
 
3204
3204
    def __init__(self, bzrdir):
3205
 
        self.bzrdir = bzrdir
 
3205
        self.controldir = bzrdir
3206
3206
 
3207
3207
 
3208
3208
class NoWhoami(BzrError):