/brz/remove-bazaar

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