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

  • Committer: Jelmer Vernooij
  • Date: 2017-07-24 01:09:25 UTC
  • mfrom: (6740 trunk)
  • mto: This revision was merged to the branch mainline in revision 6743.
  • Revision ID: jelmer@jelmer.uk-20170724010925-nted35vp0ufbs3p2
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/branch.py
811
811
                try:
812
812
                    url = url.encode('ascii')
813
813
                except UnicodeEncodeError:
814
 
                    raise errors.InvalidURL(url,
 
814
                    raise urlutils.InvalidURL(url,
815
815
                        "Urls must be 7-bit ascii, "
816
816
                        "use breezy.urlutils.escape")
817
817
            url = urlutils.relative_url(self.base, url)
1123
1123
            parent = urlutils.local_path_to_url(parent.decode('utf8'))
1124
1124
        try:
1125
1125
            return urlutils.join(self.base[:-1], parent)
1126
 
        except errors.InvalidURLJoin as e:
 
1126
        except urlutils.InvalidURLJoin as e:
1127
1127
            raise errors.InaccessibleParent(parent, self.user_url)
1128
1128
 
1129
1129
    def _get_parent_location(self):
2270
2270
            try:
2271
2271
                relpath = self.source.user_transport.relpath(normalized)
2272
2272
                source_is_master = (relpath == '')
2273
 
            except (errors.PathNotChild, errors.InvalidURL):
 
2273
            except (errors.PathNotChild, urlutils.InvalidURL):
2274
2274
                source_is_master = False
2275
2275
        if not local and bound_location and not source_is_master:
2276
2276
            # not pulling from master, so we need to update master.