/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4597.9.8 by Vincent Ladeuil
Merge bzr.dev into cleanup
1
# Copyright (C) 2010 Canonical Ltd
4969.2.16 by Aaron Bentley
Updates from review.
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
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
17
from bzrlib import (
18
    errors,
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
19
    hooks,
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
20
    )
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
23
import webbrowser
24
25
from bzrlib import (
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
26
    msgeditor,
27
)
4969.2.16 by Aaron Bentley
Updates from review.
28
from bzrlib.plugins.launchpad import (
29
    lp_api,
30
    lp_registration,
31
)
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
32
""")
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
33
34
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
35
class ProposeMergeHooks(hooks.Hooks):
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
36
    """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
37
38
    def __init__(self):
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
39
        hooks.Hooks.__init__(self)
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
40
        self.create_hook(
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
41
            hooks.HookPoint(
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
42
                'get_prerequisite',
43
                "Return the prerequisite branch for proposing as merge.",
4969.2.9 by Aaron Bentley
Add a hook for getting an initial merge proposal body.
44
                (2, 1), None),
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
45
        )
46
        self.create_hook(
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
47
            hooks.HookPoint(
4969.2.9 by Aaron Bentley
Add a hook for getting an initial merge proposal body.
48
                'merge_proposal_body',
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
49
                "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.
50
                (2, 1), None),
51
        )
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
52
53
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
54
class Proposer(object):
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
55
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
56
    hooks = ProposeMergeHooks()
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
57
58
    def __init__(self, tree, source_branch, target_branch, message, reviews,
5244.1.3 by Robert Collins
Allow setting new proposals as approved immediately.
59
                 staging=False, approve=False):
4969.2.10 by Aaron Bentley
Cleanup and docs.
60
        """Constructor.
61
62
        :param tree: The working tree for the source branch.
63
        :param source_branch: The branch to propose for merging.
64
        :param target_branch: The branch to merge into.
65
        :param message: The commit message to use.  (May be None.)
66
        :param reviews: A list of tuples of reviewer, review type.
67
        :param staging: If True, propose the merge against staging instead of
68
            production.
5244.1.3 by Robert Collins
Allow setting new proposals as approved immediately.
69
        :param approve: If True, mark the new proposal as approved immediately.
70
            This is useful when a project permits some things to be approved
71
            by the submitter (e.g. merges between release and deployment
72
            branches).
4969.2.10 by Aaron Bentley
Cleanup and docs.
73
        """
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
74
        self.tree = tree
4969.2.4 by Aaron Bentley
Remove the staging instance variable and the lp() function. Just make a
75
        if staging:
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
76
            lp_instance = 'staging'
4969.2.4 by Aaron Bentley
Remove the staging instance variable and the lp() function. Just make a
77
        else:
5050.45.15 by Vincent Ladeuil
Fix mode edge.lp.net references in the lp plugin and check-newsbugs.
78
            lp_instance = 'production'
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
79
        service = lp_registration.LaunchpadService(lp_instance=lp_instance)
80
        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
81
        self.source_branch = lp_api.LaunchpadBranch.from_bzr(
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
82
            self.launchpad, source_branch)
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
83
        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
84
            self.target_branch = self.source_branch.get_dev_focus()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
85
        else:
4969.2.3 by Aaron Bentley
Move LaunchpadBranch to lp_api. Change the interface so that it uses launchpad
86
            self.target_branch = lp_api.LaunchpadBranch.from_bzr(
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
87
                self.launchpad, target_branch)
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
88
        self.commit_message = message
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
89
        # XXX: this is where bug lp:583638 could be tackled.
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
90
        if reviews == []:
91
            target_reviewer = self.target_branch.lp.reviewer
92
            if target_reviewer is None:
93
                raise errors.BzrCommandError('No reviewer specified')
94
            self.reviews = [(target_reviewer, '')]
95
        else:
4969.2.4 by Aaron Bentley
Remove the staging instance variable and the lp() function. Just make a
96
            self.reviews = [(self.launchpad.people[reviewer], review_type)
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
97
                            for reviewer, review_type in
98
                            reviews]
5244.1.3 by Robert Collins
Allow setting new proposals as approved immediately.
99
        self.approve = approve
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
100
101
    def get_comment(self, prerequisite_branch):
4969.2.10 by Aaron Bentley
Cleanup and docs.
102
        """Determine the initial comment for the merge proposal."""
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
103
        info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]
104
        info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)
105
        if prerequisite_branch is not None:
106
            info.append("Prereq: %s\n" % prerequisite_branch.lp.bzr_identity)
107
        for rdata in self.reviews:
108
            uniquename = "%s (%s)" % (rdata[0].display_name, rdata[0].name)
109
            info.append('Reviewer: %s, type "%s"\n' % (uniquename, rdata[1]))
110
        self.source_branch.bzr.lock_read()
111
        try:
112
            self.target_branch.bzr.lock_read()
113
            try:
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
114
                body = self.get_initial_body()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
115
            finally:
116
                self.target_branch.bzr.unlock()
117
        finally:
118
            self.source_branch.bzr.unlock()
119
        initial_comment = msgeditor.edit_commit_message(''.join(info),
120
                                                        start_message=body)
121
        return initial_comment.strip().encode('utf-8')
122
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
123
    def get_initial_body(self):
4969.2.15 by Aaron Bentley
Update docs.
124
        """Get a body for the proposal for the user to modify.
125
126
        :return: a str or None.
127
        """
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
128
        def list_modified_files():
129
            lca_tree = self.source_branch.find_lca_tree(
130
                self.target_branch)
131
            source_tree = self.source_branch.bzr.basis_tree()
132
            files = modified_files(lca_tree, source_tree)
133
            return list(files)
134
        target_loc = ('bzr+ssh://bazaar.launchpad.net/%s' %
135
                       self.target_branch.lp.unique_name)
4969.2.9 by Aaron Bentley
Add a hook for getting an initial merge proposal body.
136
        body = None
137
        for hook in self.hooks['merge_proposal_body']:
138
            body = hook({
139
                'tree': self.tree,
140
                'target_branch': target_loc,
141
                'modified_files_callback': list_modified_files,
142
                'old_body': body,
143
            })
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
144
        return body
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
145
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
146
    def check_proposal(self):
4969.2.10 by Aaron Bentley
Cleanup and docs.
147
        """Check that the submission is sensible."""
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
148
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
149
            raise errors.BzrCommandError(
150
                'Source and target branches must be different.')
151
        for mp in self.source_branch.lp.landing_targets:
152
            if mp.queue_status in ('Merged', 'Rejected'):
153
                continue
154
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
155
                raise errors.BzrCommandError(
156
                    'There is already a branch merge proposal: %s' %
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
157
                    lp_api.canonical_url(mp))
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
158
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
159
    def _get_prerequisite_branch(self):
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
160
        hooks = self.hooks['get_prerequisite']
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
161
        prerequisite_branch = None
162
        for hook in hooks:
163
            prerequisite_branch = hook(
164
                {'launchpad': self.launchpad,
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
165
                 'source_branch': self.source_branch,
166
                 'target_branch': self.target_branch,
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
167
                 'prerequisite_branch': prerequisite_branch})
168
        return prerequisite_branch
169
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
170
    def call_webservice(self, call, *args, **kwargs):
171
        """Make a call to the webservice, wrapping failures.
172
        
173
        :param call: The call to make.
174
        :param *args: *args for the call.
175
        :param **kwargs: **kwargs for the call.
176
        :return: The result of calling call(*args, *kwargs).
177
        """
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
178
        from lazr.restfulclient import errors as restful_errors
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
179
        try:
180
            return call(*args, **kwargs)
181
        except restful_errors.HTTPError, e:
182
            error_lines = []
183
            for line in e.content.splitlines():
184
                if line.startswith('Traceback (most recent call last):'):
185
                    break
186
                error_lines.append(line)
187
            raise Exception(''.join(error_lines))
188
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
189
    def create_proposal(self):
4969.2.10 by Aaron Bentley
Cleanup and docs.
190
        """Perform the submission."""
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
191
        prerequisite_branch = self._get_prerequisite_branch()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
192
        if prerequisite_branch is None:
193
            prereq = None
194
        else:
195
            prereq = prerequisite_branch.lp
4969.2.14 by Aaron Bentley
Restore update functionality.
196
            prerequisite_branch.update_lp()
197
        self.source_branch.update_lp()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
198
        reviewers = []
199
        review_types = []
200
        for reviewer, review_type in self.reviews:
201
            review_types.append(review_type)
202
            reviewers.append(reviewer.self_link)
203
        initial_comment = self.get_comment(prerequisite_branch)
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
204
        mp = self.call_webservice(
205
            self.source_branch.lp.createMergeProposal,
206
            target_branch=self.target_branch.lp,
207
            prerequisite_branch=prereq,
208
            initial_comment=initial_comment,
209
            commit_message=self.commit_message, reviewers=reviewers,
210
            review_types=review_types)
5244.1.3 by Robert Collins
Allow setting new proposals as approved immediately.
211
        if self.approve:
212
            self.call_webservice(mp.setStatus, status='Approved')
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
213
        webbrowser.open(lp_api.canonical_url(mp))
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
214
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
215
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
216
def modified_files(old_tree, new_tree):
4969.2.15 by Aaron Bentley
Update docs.
217
    """Return a list of paths in the new tree with modified contents."""
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
218
    for f, (op, path), c, v, p, n, (ok, k), e in new_tree.iter_changes(
219
        old_tree):
220
        if c and k == 'file':
221
            yield str(path)