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