/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/plugins/git/__init__.py

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/__init__.py
151
151
        headers = {"Content-Type": "application/x-git-upload-pack-request"}
152
152
        req = Request('GET', url, accepted_errors=[200, 403, 404, 405],
153
153
                      headers=headers)
154
 
        if req.get_host() == "github.com":
 
154
        (scheme, user, password, host, port, path) = urlutils.parse_url(req.get_full_url())
 
155
        if host == "github.com":
155
156
            # GitHub requires we lie. https://github.com/dulwich/dulwich/issues/562
156
157
            req.add_header("User-Agent", user_agent_for_github())
157
 
        elif req.get_host() == "bazaar.launchpad.net":
 
158
        elif host == "bazaar.launchpad.net":
158
159
            # Don't attempt Git probes against bazaar.launchpad.net; pad.lv/1744830
159
160
            raise bzr_errors.NotBranchError(transport.base)
160
161
        req.follow_redirections = True