bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
4969.2.16
by Aaron Bentley
 Updates from review.  | 
1  | 
# Copyright (C) 2009, 2010 Canonical Ltd
 | 
2  | 
#
 | 
|
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
#
 | 
|
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
#
 | 
|
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
|
16  | 
||
17  | 
||
| 
4969.2.10
by Aaron Bentley
 Cleanup and docs.  | 
18  | 
import webbrowser  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
19  | 
|
20  | 
from bzrlib import (  | 
|
21  | 
errors,  | 
|
22  | 
msgeditor,  | 
|
23  | 
)
 | 
|
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
24  | 
from bzrlib.hooks import HookPoint, Hooks  | 
| 
4969.2.16
by Aaron Bentley
 Updates from review.  | 
25  | 
from bzrlib.plugins.launchpad import (  | 
26  | 
lp_api,  | 
|
27  | 
lp_registration,  | 
|
28  | 
)
 | 
|
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
29  | 
|
30  | 
from lazr.restfulclient import errors as restful_errors  | 
|
31  | 
||
32  | 
||
| 
4969.2.19
by Aaron Bentley
 Rename submit to propose everywhere.  | 
33  | 
class ProposeMergeHooks(Hooks):  | 
34  | 
"""Hooks for proposing a merge on Launchpad."""  | 
|
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
35  | 
|
36  | 
def __init__(self):  | 
|
37  | 
Hooks.__init__(self)  | 
|
38  | 
self.create_hook(  | 
|
39  | 
HookPoint(  | 
|
40  | 
'get_prerequisite',  | 
|
41  | 
"Return the prerequisite branch for proposing as merge.",  | 
|
| 
4969.2.9
by Aaron Bentley
 Add a hook for getting an initial merge proposal body.  | 
42  | 
(2, 1), None),  | 
| 
4969.2.13
by Aaron Bentley
 Get working with lpreview_body.  | 
43  | 
        )
 | 
44  | 
self.create_hook(  | 
|
| 
4969.2.9
by Aaron Bentley
 Add a hook for getting an initial merge proposal body.  | 
45  | 
HookPoint(  | 
46  | 
'merge_proposal_body',  | 
|
| 
4969.2.13
by Aaron Bentley
 Get working with lpreview_body.  | 
47  | 
"Return an initial body for the merge proposal message.",  | 
| 
4969.2.9
by Aaron Bentley
 Add a hook for getting an initial merge proposal body.  | 
48  | 
(2, 1), None),  | 
49  | 
        )
 | 
|
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
50  | 
|
51  | 
||
| 
4969.2.19
by Aaron Bentley
 Rename submit to propose everywhere.  | 
52  | 
class Proposer(object):  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
53  | 
|
| 
4969.2.19
by Aaron Bentley
 Rename submit to propose everywhere.  | 
54  | 
hooks = ProposeMergeHooks()  | 
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
55  | 
|
56  | 
def __init__(self, tree, source_branch, target_branch, message, reviews,  | 
|
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
57  | 
staging=False):  | 
| 
4969.2.10
by Aaron Bentley
 Cleanup and docs.  | 
58  | 
"""Constructor.  | 
59  | 
||
60  | 
        :param tree: The working tree for the source branch.
 | 
|
61  | 
        :param source_branch: The branch to propose for merging.
 | 
|
62  | 
        :param target_branch: The branch to merge into.
 | 
|
63  | 
        :param message: The commit message to use.  (May be None.)
 | 
|
64  | 
        :param reviews: A list of tuples of reviewer, review type.
 | 
|
65  | 
        :param staging: If True, propose the merge against staging instead of
 | 
|
66  | 
            production.
 | 
|
67  | 
        """
 | 
|
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
68  | 
self.tree = tree  | 
| 
4969.2.4
by Aaron Bentley
 Remove the staging instance variable and the lp() function. Just make a  | 
69  | 
if staging:  | 
| 
4969.2.7
by Aaron Bentley
 Add lp-submit, get working.  | 
70  | 
lp_instance = 'staging'  | 
| 
4969.2.4
by Aaron Bentley
 Remove the staging instance variable and the lp() function. Just make a  | 
71  | 
else:  | 
| 
4969.2.7
by Aaron Bentley
 Add lp-submit, get working.  | 
72  | 
lp_instance = 'edge'  | 
73  | 
service = lp_registration.LaunchpadService(lp_instance=lp_instance)  | 
|
74  | 
self.launchpad = lp_api.login(service)  | 
|
| 
4969.2.3
by Aaron Bentley
 Move LaunchpadBranch to lp_api. Change the interface so that it uses launchpad  | 
75  | 
self.source_branch = lp_api.LaunchpadBranch.from_bzr(  | 
| 
4969.2.7
by Aaron Bentley
 Add lp-submit, get working.  | 
76  | 
self.launchpad, source_branch)  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
77  | 
if target_branch is None:  | 
| 
4969.2.5
by Aaron Bentley
 It makes more sense to get the dev focus from an existing Launchpad branch  | 
78  | 
self.target_branch = self.source_branch.get_dev_focus()  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
79  | 
else:  | 
| 
4969.2.3
by Aaron Bentley
 Move LaunchpadBranch to lp_api. Change the interface so that it uses launchpad  | 
80  | 
self.target_branch = lp_api.LaunchpadBranch.from_bzr(  | 
| 
4969.2.7
by Aaron Bentley
 Add lp-submit, get working.  | 
81  | 
self.launchpad, target_branch)  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
82  | 
self.commit_message = message  | 
83  | 
if reviews == []:  | 
|
84  | 
target_reviewer = self.target_branch.lp.reviewer  | 
|
85  | 
if target_reviewer is None:  | 
|
86  | 
raise errors.BzrCommandError('No reviewer specified')  | 
|
87  | 
self.reviews = [(target_reviewer, '')]  | 
|
88  | 
else:  | 
|
| 
4969.2.4
by Aaron Bentley
 Remove the staging instance variable and the lp() function. Just make a  | 
89  | 
self.reviews = [(self.launchpad.people[reviewer], review_type)  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
90  | 
for reviewer, review_type in  | 
91  | 
reviews]  | 
|
92  | 
||
93  | 
def get_comment(self, prerequisite_branch):  | 
|
| 
4969.2.10
by Aaron Bentley
 Cleanup and docs.  | 
94  | 
"""Determine the initial comment for the merge proposal."""  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
95  | 
info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]  | 
96  | 
info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)  | 
|
97  | 
if prerequisite_branch is not None:  | 
|
98  | 
info.append("Prereq: %s\n" % prerequisite_branch.lp.bzr_identity)  | 
|
99  | 
for rdata in self.reviews:  | 
|
100  | 
uniquename = "%s (%s)" % (rdata[0].display_name, rdata[0].name)  | 
|
101  | 
info.append('Reviewer: %s, type "%s"\n' % (uniquename, rdata[1]))  | 
|
102  | 
self.source_branch.bzr.lock_read()  | 
|
103  | 
try:  | 
|
104  | 
self.target_branch.bzr.lock_read()  | 
|
105  | 
try:  | 
|
| 
4969.2.13
by Aaron Bentley
 Get working with lpreview_body.  | 
106  | 
body = self.get_initial_body()  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
107  | 
finally:  | 
108  | 
self.target_branch.bzr.unlock()  | 
|
109  | 
finally:  | 
|
110  | 
self.source_branch.bzr.unlock()  | 
|
111  | 
initial_comment = msgeditor.edit_commit_message(''.join(info),  | 
|
112  | 
start_message=body)  | 
|
113  | 
return initial_comment.strip().encode('utf-8')  | 
|
114  | 
||
| 
4969.2.13
by Aaron Bentley
 Get working with lpreview_body.  | 
115  | 
def get_initial_body(self):  | 
| 
4969.2.15
by Aaron Bentley
 Update docs.  | 
116  | 
"""Get a body for the proposal for the user to modify.  | 
117  | 
||
118  | 
        :return: a str or None.
 | 
|
119  | 
        """
 | 
|
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
120  | 
def list_modified_files():  | 
121  | 
lca_tree = self.source_branch.find_lca_tree(  | 
|
122  | 
self.target_branch)  | 
|
123  | 
source_tree = self.source_branch.bzr.basis_tree()  | 
|
124  | 
files = modified_files(lca_tree, source_tree)  | 
|
125  | 
return list(files)  | 
|
126  | 
target_loc = ('bzr+ssh://bazaar.launchpad.net/%s' %  | 
|
127  | 
self.target_branch.lp.unique_name)  | 
|
| 
4969.2.9
by Aaron Bentley
 Add a hook for getting an initial merge proposal body.  | 
128  | 
body = None  | 
129  | 
for hook in self.hooks['merge_proposal_body']:  | 
|
130  | 
body = hook({  | 
|
131  | 
'tree': self.tree,  | 
|
132  | 
'target_branch': target_loc,  | 
|
133  | 
'modified_files_callback': list_modified_files,  | 
|
134  | 
'old_body': body,  | 
|
135  | 
            })
 | 
|
| 
4969.2.13
by Aaron Bentley
 Get working with lpreview_body.  | 
136  | 
return body  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
137  | 
|
| 
4969.2.19
by Aaron Bentley
 Rename submit to propose everywhere.  | 
138  | 
def check_proposal(self):  | 
| 
4969.2.10
by Aaron Bentley
 Cleanup and docs.  | 
139  | 
"""Check that the submission is sensible."""  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
140  | 
if self.source_branch.lp.self_link == self.target_branch.lp.self_link:  | 
141  | 
raise errors.BzrCommandError(  | 
|
142  | 
'Source and target branches must be different.')  | 
|
143  | 
for mp in self.source_branch.lp.landing_targets:  | 
|
144  | 
if mp.queue_status in ('Merged', 'Rejected'):  | 
|
145  | 
                continue
 | 
|
146  | 
if mp.target_branch.self_link == self.target_branch.lp.self_link:  | 
|
147  | 
raise errors.BzrCommandError(  | 
|
148  | 
'There is already a branch merge proposal: %s' %  | 
|
149  | 
canonical_url(mp))  | 
|
150  | 
||
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
151  | 
def _get_prerequisite_branch(self):  | 
| 
4969.2.7
by Aaron Bentley
 Add lp-submit, get working.  | 
152  | 
hooks = self.hooks['get_prerequisite']  | 
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
153  | 
prerequisite_branch = None  | 
154  | 
for hook in hooks:  | 
|
155  | 
prerequisite_branch = hook(  | 
|
156  | 
{'launchpad': self.launchpad,  | 
|
| 
4969.2.7
by Aaron Bentley
 Add lp-submit, get working.  | 
157  | 
'source_branch': self.source_branch,  | 
158  | 
'target_branch': self.target_branch,  | 
|
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
159  | 
'prerequisite_branch': prerequisite_branch})  | 
160  | 
return prerequisite_branch  | 
|
161  | 
||
| 
4969.2.19
by Aaron Bentley
 Rename submit to propose everywhere.  | 
162  | 
def create_proposal(self):  | 
| 
4969.2.10
by Aaron Bentley
 Cleanup and docs.  | 
163  | 
"""Perform the submission."""  | 
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
164  | 
prerequisite_branch = self._get_prerequisite_branch()  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
165  | 
if prerequisite_branch is None:  | 
166  | 
prereq = None  | 
|
167  | 
else:  | 
|
168  | 
prereq = prerequisite_branch.lp  | 
|
| 
4969.2.14
by Aaron Bentley
 Restore update functionality.  | 
169  | 
prerequisite_branch.update_lp()  | 
170  | 
self.source_branch.update_lp()  | 
|
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
171  | 
reviewers = []  | 
172  | 
review_types = []  | 
|
173  | 
for reviewer, review_type in self.reviews:  | 
|
174  | 
review_types.append(review_type)  | 
|
175  | 
reviewers.append(reviewer.self_link)  | 
|
176  | 
initial_comment = self.get_comment(prerequisite_branch)  | 
|
177  | 
try:  | 
|
178  | 
mp = self.source_branch.lp.createMergeProposal(  | 
|
179  | 
target_branch=self.target_branch.lp,  | 
|
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
180  | 
prerequisite_branch=prereq,  | 
181  | 
initial_comment=initial_comment,  | 
|
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
182  | 
commit_message=self.commit_message, reviewers=reviewers,  | 
183  | 
review_types=review_types)  | 
|
184  | 
except restful_errors.HTTPError, e:  | 
|
| 
4969.2.16
by Aaron Bentley
 Updates from review.  | 
185  | 
error_lines = []  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
186  | 
for line in e.content.splitlines():  | 
187  | 
if line.startswith('Traceback (most recent call last):'):  | 
|
188  | 
                    break
 | 
|
| 
4969.2.16
by Aaron Bentley
 Updates from review.  | 
189  | 
error_lines.append(line)  | 
| 
4969.2.20
by Aaron Bentley
 Fix exception handling.  | 
190  | 
raise Exception(''.join(error_lines))  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
191  | 
else:  | 
192  | 
webbrowser.open(canonical_url(mp))  | 
|
193  | 
||
| 
4969.2.6
by Aaron Bentley
 Add a hook point for getting the prerequisite branch, and make the pipeline  | 
194  | 
|
| 
4969.2.13
by Aaron Bentley
 Get working with lpreview_body.  | 
195  | 
def modified_files(old_tree, new_tree):  | 
| 
4969.2.15
by Aaron Bentley
 Update docs.  | 
196  | 
"""Return a list of paths in the new tree with modified contents."""  | 
| 
4969.2.13
by Aaron Bentley
 Get working with lpreview_body.  | 
197  | 
for f, (op, path), c, v, p, n, (ok, k), e in new_tree.iter_changes(  | 
198  | 
old_tree):  | 
|
199  | 
if c and k == 'file':  | 
|
200  | 
yield str(path)  | 
|
201  | 
||
202  | 
||
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
203  | 
def canonical_url(object):  | 
| 
4969.2.10
by Aaron Bentley
 Cleanup and docs.  | 
204  | 
"""Return the canonical URL for a branch."""  | 
| 
4969.2.1
by Aaron Bentley
 Initial import of lp_submit command.  | 
205  | 
url = object.self_link.replace('https://api.', 'https://code.')  | 
206  | 
return url.replace('/beta/', '/')  |