1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
# Copyright (C) 2018 Jelmer Vernooij <jelmer@jelmer.uk>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Propose command implementations."""
from __future__ import absolute_import
from io import StringIO
from ... import (
branch as _mod_branch,
controldir,
errors,
log as _mod_log,
missing as _mod_missing,
msgeditor,
urlutils,
)
from ...i18n import gettext
from ...commands import Command
from ...option import (
ListOption,
Option,
RegistryOption,
)
from ...sixish import text_type
from ...trace import note
from . import (
propose as _mod_propose,
)
def branch_name(branch):
if branch.name:
return branch.name
return urlutils.basename(branch.user_url)
class cmd_publish_derived(Command):
__doc__ = """Publish a derived branch.
Try to create a public copy of a local branch on a hosting site,
derived from the specified base branch.
Reasonable defaults are picked for owner name, branch name and project
name, but they can also be overridden from the command-line.
"""
takes_options = [
'directory',
Option('owner', help='Owner of the new remote branch.', type=str),
Option('project', help='Project name for the new remote branch.',
type=str),
Option('name', help='Name of the new remote branch.', type=str),
Option('no-allow-lossy',
help='Allow fallback to lossy push, if necessary.'),
Option('overwrite', help="Overwrite existing commits."),
]
takes_args = ['submit_branch?']
def run(self, submit_branch=None, owner=None, name=None, project=None,
no_allow_lossy=False, overwrite=False, directory='.'):
local_branch = _mod_branch.Branch.open_containing(directory)[0]
self.add_cleanup(local_branch.lock_write().unlock)
if submit_branch is None:
submit_branch = local_branch.get_submit_branch()
note(gettext('Using submit branch %s') % submit_branch)
if submit_branch is None:
submit_branch = local_branch.get_parent()
note(gettext('Using parent branch %s') % submit_branch)
submit_branch = _mod_branch.Branch.open(submit_branch)
if name is None:
name = branch_name(local_branch)
hoster = _mod_propose.get_hoster(submit_branch)
remote_branch, public_url = hoster.publish_derived(
local_branch, submit_branch, name=name, project=project,
owner=owner, allow_lossy=not no_allow_lossy,
overwrite=overwrite)
local_branch.set_push_location(remote_branch.user_url)
local_branch.set_public_branch(public_url)
note(gettext("Pushed to %s") % public_url)
def summarize_unmerged(local_branch, remote_branch, target):
"""Generate a text description of the unmerged revisions in branch.
:param branch: The proposed branch
:param target: Target branch
:return: A string
"""
log_format = _mod_log.log_formatter_registry.get_default(local_branch)
to_file = StringIO()
lf = log_format(to_file=to_file, show_ids=False, show_timezone='original')
local_extra = _mod_missing.find_unmerged(
remote_branch, target, restrict='local')[0]
if remote_branch.supports_tags():
rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
else:
rev_tag_dict = {}
for revision in _mod_missing.iter_log_revisions(
local_extra, local_branch.repository, False, rev_tag_dict):
lf.log_revision(revision)
return to_file.getvalue()
class cmd_propose_merge(Command):
__doc__ = """Propose a branch for merging.
This command creates a merge proposal for the local
branch to the target branch. The format of the merge
proposal depends on the submit branch.
"""
takes_options = [
'directory',
RegistryOption(
'hoster',
help='Use the hoster.',
lazy_registry=('breezy.plugins.propose.propose', 'hosters')),
ListOption('reviewers', short_name='R', type=text_type,
help='Requested reviewers.'),
Option('name', help='Name of the new remote branch.', type=str),
Option('description', help='Description of the change.', type=str),
ListOption('labels', short_name='l', type=text_type,
help='Labels to apply.'),
Option('no-allow-lossy',
help='Allow fallback to lossy push, if necessary.'),
]
takes_args = ['submit_branch?']
aliases = ['propose']
def run(self, submit_branch=None, directory='.', hoster=None,
reviewers=None, name=None, no_allow_lossy=False, description=None,
labels=None):
tree, branch, relpath = (
controldir.ControlDir.open_containing_tree_or_branch(directory))
if submit_branch is None:
submit_branch = branch.get_submit_branch()
if submit_branch is None:
submit_branch = branch.get_parent()
if submit_branch is None:
raise errors.BzrCommandError(
gettext("No target location specified or remembered"))
else:
target = _mod_branch.Branch.open(submit_branch)
if hoster is None:
hoster = _mod_propose.get_hoster(target)
else:
hoster = hoster.probe(target)
if name is None:
name = branch_name(branch)
remote_branch, public_branch_url = hoster.publish_derived(
branch, target, name=name, allow_lossy=not no_allow_lossy)
branch.set_push_location(remote_branch.user_url)
note(gettext('Published branch to %s') % public_branch_url)
proposal_builder = hoster.get_proposer(remote_branch, target)
if description is None:
body = proposal_builder.get_initial_body()
info = proposal_builder.get_infotext()
info += "\n\n" + summarize_unmerged(branch, remote_branch, target)
description = msgeditor.edit_commit_message(
info, start_message=body)
try:
proposal = proposal_builder.create_proposal(
description=description, reviewers=reviewers, labels=labels)
except _mod_propose.MergeProposalExists as e:
raise errors.BzrCommandError(gettext(
'There is already a branch merge proposal: %s') % e.url)
note(gettext('Merge proposal created: %s') % proposal.url)
class cmd_find_merge_proposal(Command):
__doc__ = """Find a merge proposal.
"""
takes_options = ['directory']
takes_args = ['submit_branch?']
aliases = ['find-proposal']
def run(self, directory='.', submit_branch=None):
tree, branch, relpath = controldir.ControlDir.open_containing_tree_or_branch(
directory)
public_location = branch.get_public_branch()
if public_location:
branch = _mod_branch.Branch.open(public_location)
if submit_branch is None:
submit_branch = branch.get_submit_branch()
if submit_branch is None:
submit_branch = branch.get_parent()
if submit_branch is None:
raise errors.BzrCommandError(
gettext("No target location specified or remembered"))
else:
target = _mod_branch.Branch.open(submit_branch)
hoster = _mod_propose.get_hoster(branch)
mp = hoster.get_proposal(branch, target)
self.outf.write(gettext('Merge proposal: %s\n') % mp.url)
class cmd_github_login(Command):
__doc__ = """Log into GitHub.
"""
takes_args = ['username?']
def run(self, username=None):
from github import Github, GithubException
from breezy.config import AuthenticationConfig
authconfig = AuthenticationConfig()
if username is None:
username = authconfig.get_user(
'https', 'github.com', prompt=u'GitHub username', ask=True)
password = authconfig.get_password('https', 'github.com', username)
client = Github(username, password)
user = client.get_user()
try:
authorization = user.create_authorization(
scopes=['user', 'repo', 'delete_repo'], note='Breezy',
note_url='https://github.com/breezy-team/breezy')
except GithubException as e:
errs = e.data.get('errors', [])
if errs:
err_code = errs[0].get('code')
if err_code == u'already_exists':
raise errors.BzrCommandError('token already exists')
raise errors.BzrCommandError(e.data['message'])
# TODO(jelmer): This should really use something in
# AuthenticationConfig
from .github import store_github_token
store_github_token(scheme='https', host='github.com',
token=authorization.token)
|