/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
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
18
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
19
from ... import (
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
20
    errors,
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
21
    hooks,
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
22
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
23
from ...lazy_import import lazy_import
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
24
lazy_import(globals(), """
25
import webbrowser
26
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
27
from breezy import (
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
28
    msgeditor,
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
29
    )
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
30
from breezy.i18n import gettext
31
from breezy.plugins.launchpad import (
4969.2.16 by Aaron Bentley
Updates from review.
32
    lp_api,
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
33
    )
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
34
""")
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
35
36
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
37
class ProposeMergeHooks(hooks.Hooks):
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
38
    """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
39
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
40
    def __init__(self):
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
41
        hooks.Hooks.__init__(self, "breezy.plugins.launchpad.lp_propose",
7143.15.2 by Jelmer Vernooij
Run autopep8.
42
                             "Proposer.hooks")
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
43
        self.add_hook('get_prerequisite',
7143.15.2 by Jelmer Vernooij
Run autopep8.
44
                      "Return the prerequisite branch for proposing as merge.", (2, 1))
5622.3.2 by Jelmer Vernooij
Add more lazily usable hook points.
45
        self.add_hook('merge_proposal_body',
7143.15.2 by Jelmer Vernooij
Run autopep8.
46
                      "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
47
48
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
49
class Proposer(object):
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
50
5622.3.10 by Jelmer Vernooij
Don't require arguments to hooks.
51
    hooks = ProposeMergeHooks()
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
52
53
    def __init__(self, tree, source_branch, target_branch, message, reviews,
6468.4.2 by Ross Lagerwall
Use --fixes instead of --link-bug for consistency with bzr commit.
54
                 staging=False, approve=False, fixes=None):
4969.2.10 by Aaron Bentley
Cleanup and docs.
55
        """Constructor.
56
57
        :param tree: The working tree for the source branch.
58
        :param source_branch: The branch to propose for merging.
59
        :param target_branch: The branch to merge into.
60
        :param message: The commit message to use.  (May be None.)
61
        :param reviews: A list of tuples of reviewer, review type.
62
        :param staging: If True, propose the merge against staging instead of
63
            production.
5244.1.3 by Robert Collins
Allow setting new proposals as approved immediately.
64
        :param approve: If True, mark the new proposal as approved immediately.
65
            This is useful when a project permits some things to be approved
66
            by the submitter (e.g. merges between release and deployment
67
            branches).
4969.2.10 by Aaron Bentley
Cleanup and docs.
68
        """
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
69
        self.tree = tree
4969.2.4 by Aaron Bentley
Remove the staging instance variable and the lp() function. Just make a
70
        if staging:
7254.1.1 by Jelmer Vernooij
Defer imports.
71
            lp_base_url = lp_api.uris.STAGING_SERVICE_ROOT
4969.2.4 by Aaron Bentley
Remove the staging instance variable and the lp() function. Just make a
72
        else:
7254.1.1 by Jelmer Vernooij
Defer imports.
73
            lp_base_url = lp_api.uris.LPNET_SERVICE_ROOT
7253 by Jelmer Vernooij
Fix default launchpadlib API URL.
74
        self.launchpad = lp_api.connect_launchpad(lp_base_url)
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
6468.4.2 by Ross Lagerwall
Use --fixes instead of --link-bug for consistency with bzr commit.
91
        self.fixes = fixes
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
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."""
6603.4.1 by Shawn Wang
use initial_comment as commit_message for lp_propose
95
        if self.commit_message is not None:
96
            return self.commit_message.strip().encode('utf-8')
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
97
        info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]
98
        info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)
99
        if prerequisite_branch is not None:
100
            info.append("Prereq: %s\n" % prerequisite_branch.lp.bzr_identity)
101
        for rdata in self.reviews:
102
            uniquename = "%s (%s)" % (rdata[0].display_name, rdata[0].name)
103
            info.append('Reviewer: %s, type "%s"\n' % (uniquename, rdata[1]))
6754.8.4 by Jelmer Vernooij
Use new context stuff.
104
        with self.source_branch.bzr.lock_read(), \
105
                self.target_branch.bzr.lock_read():
106
            body = self.get_initial_body()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
107
        initial_comment = msgeditor.edit_commit_message(''.join(info),
108
                                                        start_message=body)
109
        return initial_comment.strip().encode('utf-8')
110
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
111
    def get_initial_body(self):
4969.2.15 by Aaron Bentley
Update docs.
112
        """Get a body for the proposal for the user to modify.
113
114
        :return: a str or None.
115
        """
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
116
        def list_modified_files():
117
            lca_tree = self.source_branch.find_lca_tree(
118
                self.target_branch)
119
            source_tree = self.source_branch.bzr.basis_tree()
120
            files = modified_files(lca_tree, source_tree)
121
            return list(files)
122
        target_loc = ('bzr+ssh://bazaar.launchpad.net/%s' %
7143.15.2 by Jelmer Vernooij
Run autopep8.
123
                      self.target_branch.lp.unique_name)
4969.2.9 by Aaron Bentley
Add a hook for getting an initial merge proposal body.
124
        body = None
125
        for hook in self.hooks['merge_proposal_body']:
126
            body = hook({
127
                'tree': self.tree,
128
                'target_branch': target_loc,
129
                'modified_files_callback': list_modified_files,
130
                'old_body': body,
131
            })
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
132
        return body
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
133
6570.1.2 by Jonathan Lange
Set the approved revision to tip.
134
    def get_source_revid(self):
135
        """Get the revision ID of the source branch."""
136
        source_branch = self.source_branch.bzr
6754.8.4 by Jelmer Vernooij
Use new context stuff.
137
        with source_branch.lock_read():
6570.1.2 by Jonathan Lange
Set the approved revision to tip.
138
            return source_branch.last_revision()
139
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
140
    def check_proposal(self):
4969.2.10 by Aaron Bentley
Cleanup and docs.
141
        """Check that the submission is sensible."""
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
142
        if self.source_branch.lp.self_link == self.target_branch.lp.self_link:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
143
            raise errors.CommandError(
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
144
                'Source and target branches must be different.')
145
        for mp in self.source_branch.lp.landing_targets:
146
            if mp.queue_status in ('Merged', 'Rejected'):
147
                continue
148
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
7490.61.1 by Jelmer Vernooij
Rename BzrCommandError to CommandError.
149
                raise errors.CommandError(gettext(
6150.3.1 by Jonathan Riddell
gettext() in launchpad plugin
150
                    '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.
151
                    lp_api.canonical_url(mp))
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
152
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
153
    def _get_prerequisite_branch(self):
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
154
        hooks = self.hooks['get_prerequisite']
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
155
        prerequisite_branch = None
156
        for hook in hooks:
157
            prerequisite_branch = hook(
158
                {'launchpad': self.launchpad,
4969.2.7 by Aaron Bentley
Add lp-submit, get working.
159
                 'source_branch': self.source_branch,
160
                 'target_branch': self.target_branch,
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
161
                 'prerequisite_branch': prerequisite_branch})
162
        return prerequisite_branch
163
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
164
    def call_webservice(self, call, *args, **kwargs):
165
        """Make a call to the webservice, wrapping failures.
7143.15.2 by Jelmer Vernooij
Run autopep8.
166
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
167
        :param call: The call to make.
168
        :param *args: *args for the call.
169
        :param **kwargs: **kwargs for the call.
170
        :return: The result of calling call(*args, *kwargs).
171
        """
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
172
        from lazr.restfulclient import errors as restful_errors
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
173
        try:
174
            return call(*args, **kwargs)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
175
        except restful_errors.HTTPError as e:
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
176
            error_lines = []
177
            for line in e.content.splitlines():
178
                if line.startswith('Traceback (most recent call last):'):
179
                    break
180
                error_lines.append(line)
181
            raise Exception(''.join(error_lines))
182
6570.1.1 by Jonathan Lange
Factor out approve code.
183
    def approve_proposal(self, mp):
6570.1.2 by Jonathan Lange
Set the approved revision to tip.
184
        revid = self.get_source_revid()
6570.1.4 by Jonathan Lange
Vote for approve when we approve.
185
        self.call_webservice(
186
            mp.createComment,
187
            vote=u'Approve',
7143.15.2 by Jelmer Vernooij
Run autopep8.
188
            subject='',  # Use the default subject.
6570.1.5 by Jonathan Lange
Use the default subject
189
            content=u"Rubberstamp! Proposer approves of own proposal.")
6570.1.4 by Jonathan Lange
Vote for approve when we approve.
190
        self.call_webservice(mp.setStatus, status=u'Approved', revid=revid)
6570.1.1 by Jonathan Lange
Factor out approve code.
191
4969.2.19 by Aaron Bentley
Rename submit to propose everywhere.
192
    def create_proposal(self):
4969.2.10 by Aaron Bentley
Cleanup and docs.
193
        """Perform the submission."""
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
194
        prerequisite_branch = self._get_prerequisite_branch()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
195
        if prerequisite_branch is None:
196
            prereq = None
197
        else:
198
            prereq = prerequisite_branch.lp
4969.2.14 by Aaron Bentley
Restore update functionality.
199
            prerequisite_branch.update_lp()
200
        self.source_branch.update_lp()
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
201
        reviewers = []
202
        review_types = []
203
        for reviewer, review_type in self.reviews:
204
            review_types.append(review_type)
205
            reviewers.append(reviewer.self_link)
206
        initial_comment = self.get_comment(prerequisite_branch)
5244.1.2 by Robert Collins
Refactor to make calling the webservice cleaner.
207
        mp = self.call_webservice(
208
            self.source_branch.lp.createMergeProposal,
209
            target_branch=self.target_branch.lp,
210
            prerequisite_branch=prereq,
211
            initial_comment=initial_comment,
212
            commit_message=self.commit_message, reviewers=reviewers,
213
            review_types=review_types)
5244.1.3 by Robert Collins
Allow setting new proposals as approved immediately.
214
        if self.approve:
6570.1.1 by Jonathan Lange
Factor out approve code.
215
            self.approve_proposal(mp)
6468.4.2 by Ross Lagerwall
Use --fixes instead of --link-bug for consistency with bzr commit.
216
        if self.fixes:
6468.4.3 by Ross Lagerwall
Allow the --fixes argument to start with 'lp:' for consistency with bzr commit.
217
            if self.fixes.startswith('lp:'):
218
                self.fixes = self.fixes[3:]
6468.4.1 by Ross Lagerwall
Add '--link-bug' option to lp-propose-merge.
219
            self.call_webservice(
220
                self.source_branch.lp.linkBug,
6468.4.2 by Ross Lagerwall
Use --fixes instead of --link-bug for consistency with bzr commit.
221
                bug=self.launchpad.bugs[int(self.fixes)])
5615.1.1 by Jelmer Vernooij
Lazy load a couple of modules in bzrlib.plugins.launchpad.lp_propose.
222
        webbrowser.open(lp_api.canonical_url(mp))
4969.2.1 by Aaron Bentley
Initial import of lp_submit command.
223
4969.2.6 by Aaron Bentley
Add a hook point for getting the prerequisite branch, and make the pipeline
224
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
225
def modified_files(old_tree, new_tree):
4969.2.15 by Aaron Bentley
Update docs.
226
    """Return a list of paths in the new tree with modified contents."""
7322.1.6 by Jelmer Vernooij
Use the new attributes on TreeChange.
227
    for change in new_tree.iter_changes(old_tree):
228
        if change.changed_content and change.kind[1] == 'file':
4969.2.13 by Aaron Bentley
Get working with lpreview_body.
229
            yield str(path)