/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:
5616.1.1 by Jelmer Vernooij
Support 'bzr lp-propose' without an explicit target branch for packaging branches.
84
            self.target_branch = self.source_branch.get_target()
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 == []:
5616.5.2 by Jelmer Vernooij
Fix typo.
91
            self.reviews = []
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
92
        else:
4969.2.4 by Aaron Bentley
Remove the staging instance variable and the lp() function. Just make a
93
            self.reviews = [(self.launchpad.people[reviewer], review_type)
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
94
                            for reviewer, review_type in
95
                            reviews]
5244.1.3 by Robert Collins
Allow setting new proposals as approved immediately.
96
        self.approve = approve
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
97
98
    def get_comment(self, prerequisite_branch):
4969.2.10 by Aaron Bentley
Cleanup and docs.
99
        """Determine the initial comment for the merge proposal."""
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
100
        info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]
101
        info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)
102
        if prerequisite_branch is not None:
103
            info.append("Prereq: %s\n" % prerequisite_branch.lp.bzr_identity)
104
        for rdata in self.reviews:
105
            uniquename = "%s (%s)" % (rdata[0].display_name, rdata[0].name)
106
            info.append('Reviewer: %s, type "%s"\n' % (uniquename, rdata[1]))
107
        self.source_branch.bzr.lock_read()
108
        try:
109
            self.target_branch.bzr.lock_read()
110
            try:
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
111
                body = self.get_initial_body()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
112
            finally:
113
                self.target_branch.bzr.unlock()
114
        finally:
115
            self.source_branch.bzr.unlock()
116
        initial_comment = msgeditor.edit_commit_message(''.join(info),
117
                                                        start_message=body)
118
        return initial_comment.strip().encode('utf-8')
119
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
120
    def get_initial_body(self):
4969.2.15 by Aaron Bentley
Update docs.
121
        """Get a body for the proposal for the user to modify.
122
123
        :return: a str or None.
124
        """
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
125
        def list_modified_files():
126
            lca_tree = self.source_branch.find_lca_tree(
127
                self.target_branch)
128
            source_tree = self.source_branch.bzr.basis_tree()
129
            files = modified_files(lca_tree, source_tree)
130
            return list(files)
131
        target_loc = ('bzr+ssh://bazaar.launchpad.net/%s' %
132
                       self.target_branch.lp.unique_name)
4969.2.9 by Aaron Bentley
Add a hook for getting an initial merge proposal body.
133
        body = None
134
        for hook in self.hooks['merge_proposal_body']:
135
            body = hook({
136
                'tree': self.tree,
137
                'target_branch': target_loc,
138
                'modified_files_callback': list_modified_files,
139
                'old_body': body,
140
            })
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
141
        return body
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
142
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
143
    def check_proposal(self):
4969.2.10 by Aaron Bentley
Cleanup and docs.
144
        """Check that the submission is sensible."""
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
145
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
146
            raise errors.BzrCommandError(
147
                'Source and target branches must be different.')
148
        for mp in self.source_branch.lp.landing_targets:
149
            if mp.queue_status in ('Merged', 'Rejected'):
150
                continue
151
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
152
                raise errors.BzrCommandError(
153
                    '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.
154
                    lp_api.canonical_url(mp))
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
155
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
156
    def _get_prerequisite_branch(self):
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
157
        hooks = self.hooks['get_prerequisite']
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
158
        prerequisite_branch = None
159
        for hook in hooks:
160
            prerequisite_branch = hook(
161
                {'launchpad': self.launchpad,
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
162
                 'source_branch': self.source_branch,
163
                 'target_branch': self.target_branch,
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
164
                 'prerequisite_branch': prerequisite_branch})
165
        return prerequisite_branch
166
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
167
    def call_webservice(self, call, *args, **kwargs):
168
        """Make a call to the webservice, wrapping failures.
169
        
170
        :param call: The call to make.
171
        :param *args: *args for the call.
172
        :param **kwargs: **kwargs for the call.
173
        :return: The result of calling call(*args, *kwargs).
174
        """
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
175
        from lazr.restfulclient import errors as restful_errors
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
176
        try:
177
            return call(*args, **kwargs)
178
        except restful_errors.HTTPError, e:
179
            error_lines = []
180
            for line in e.content.splitlines():
181
                if line.startswith('Traceback (most recent call last):'):
182
                    break
183
                error_lines.append(line)
184
            raise Exception(''.join(error_lines))
185
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
186
    def create_proposal(self):
4969.2.10 by Aaron Bentley
Cleanup and docs.
187
        """Perform the submission."""
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
188
        prerequisite_branch = self._get_prerequisite_branch()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
189
        if prerequisite_branch is None:
190
            prereq = None
191
        else:
192
            prereq = prerequisite_branch.lp
4969.2.14 by Aaron Bentley
Restore update functionality.
193
            prerequisite_branch.update_lp()
194
        self.source_branch.update_lp()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
195
        reviewers = []
196
        review_types = []
197
        for reviewer, review_type in self.reviews:
198
            review_types.append(review_type)
199
            reviewers.append(reviewer.self_link)
200
        initial_comment = self.get_comment(prerequisite_branch)
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
201
        mp = self.call_webservice(
202
            self.source_branch.lp.createMergeProposal,
203
            target_branch=self.target_branch.lp,
204
            prerequisite_branch=prereq,
205
            initial_comment=initial_comment,
206
            commit_message=self.commit_message, reviewers=reviewers,
207
            review_types=review_types)
5244.1.3 by Robert Collins
Allow setting new proposals as approved immediately.
208
        if self.approve:
209
            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.
210
        webbrowser.open(lp_api.canonical_url(mp))
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
211
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
212
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
213
def modified_files(old_tree, new_tree):
4969.2.15 by Aaron Bentley
Update docs.
214
    """Return a list of paths in the new tree with modified contents."""
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
215
    for f, (op, path), c, v, p, n, (ok, k), e in new_tree.iter_changes(
216
        old_tree):
217
        if c and k == 'file':
218
            yield str(path)