/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/controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/controldir.py
760
760
                pass
761
761
            try:
762
762
                new_t = a_transport.clone('..')
763
 
            except errors.InvalidURLJoin:
 
763
            except urlutils.InvalidURLJoin:
764
764
                # reached the root, whatever that may be
765
765
                raise errors.NotBranchError(path=url)
766
766
            if new_t.base == a_transport.base:
1091
1091
            target_format.rich_root_data)
1092
1092
 
1093
1093
    @classmethod
1094
 
    def register_format(klass, format):
1095
 
        """Register a format that does not use '.bzr' for its control dir.
1096
 
 
1097
 
        """
1098
 
        raise errors.BzrError("ControlDirFormat.register_format() has been "
1099
 
            "removed in Bazaar 2.4. Please upgrade your plugins.")
1100
 
 
1101
 
    @classmethod
1102
1094
    def register_prober(klass, prober):
1103
1095
        """Register a prober that can look for a control dir.
1104
1096