Breezy

Merge lp:~jelmer/brz/canonical-url into lp:brz

  1. canonical-url
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7645
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/canonical-url
Merge into: lp:brz
Diff against target: 80 lines (+8/-23)
2 files modified
breezy/plugins/github/forge.py (+6/-22)
breezy/plugins/gitlab/forge.py (+2/-1)
To merge this branch: bzr merge lp:~jelmer/brz/canonical-url
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+430562@code.launchpad.net

Commit message

Return canonical GitHub URLs.

Description of the change

Return canonical GitHub URLs.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/github/forge.py'
2--- breezy/plugins/github/forge.py 2022-08-31 12:46:18 +0000
3+++ breezy/plugins/github/forge.py 2022-09-27 14:30:46 +0000
4@@ -104,25 +104,6 @@
5 _fmt = "Action requires GitHub login."
6
7
8-def connect_github():
9- """Connect to GitHub.
10- """
11- user_agent = default_user_agent()
12- auth = AuthenticationConfig()
13-
14- credentials = auth.get_credentials('https', GITHUB_HOST)
15- if credentials is not None:
16- return Github(credentials['user'], credentials['password'],
17- user_agent=user_agent)
18-
19- # TODO(jelmer): token = auth.get_token('https', GITHUB_HOST)
20- if token is not None:
21- return Github(token, user_agent=user_agent)
22- else:
23- note('Accessing GitHub anonymously. To log in, run \'brz gh-login\'.')
24- return Github(user_agent=user_agent)
25-
26-
27 class GitHubMergeProposal(MergeProposal):
28
29 def __init__(self, gh, pr):
30@@ -141,7 +122,7 @@
31 def _branch_from_part(self, part):
32 if part['repo'] is None:
33 return None
34- return github_url_to_bzr_url(part['repo']['html_url'], part['ref'])
35+ return github_url_to_bzr_url(part['repo']['clone_url'], part['ref'])
36
37 def get_source_branch_url(self):
38 return self._branch_from_part(self._pr['head'])
39@@ -210,7 +191,7 @@
40 # https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button
41 data = {}
42 if commit_message:
43- data['commit_message'] = commit_messae
44+ data['commit_message'] = commit_message
45 response = self._gh._api_request(
46 'PUT', self._pr['url'] + "/merge", body=json.dumps(data).encode('utf-8'))
47 if response.status == 422:
48@@ -424,6 +405,9 @@
49
50 def __init__(self, transport):
51 self._token = retrieve_github_token()
52+ if self._token is None:
53+ note('Accessing GitHub anonymously. '
54+ 'To log in, run \'brz gh-login\'.')
55 self.transport = transport
56 self._current_user = None
57
58@@ -466,7 +450,7 @@
59 overwrite=overwrite, name=name, lossy=True,
60 tag_selector=tag_selector)
61 return push_result.target_branch, github_url_to_bzr_url(
62- remote_repo['html_url'], name)
63+ remote_repo['clone_url'], name)
64
65 def get_push_url(self, branch):
66 owner, project, branch_name = parse_github_branch_url(branch)
67
68=== modified file 'breezy/plugins/gitlab/forge.py'
69--- breezy/plugins/gitlab/forge.py 2022-09-14 14:18:20 +0000
70+++ breezy/plugins/gitlab/forge.py 2022-09-27 14:30:46 +0000
71@@ -588,7 +588,8 @@
72 fields['labels'] = labels
73 response = self._api_request('POST', path, fields=fields)
74 if response.status == 400:
75- raise GitLabError(data.get('message'), data)
76+ data = json.loads(response.data)
77+ raise GitLabError(data.get('message'), response)
78 if response.status == 403:
79 raise errors.PermissionDenied(response.text)
80 if response.status == 409:

Subscribers

People subscribed via source and target branches