← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/devscripts/ec2test/builtins.py

  • Committer: Jonathan Lange
  • Date: 2009-09-20 10:41:25 UTC
  • mto: This revision was merged to the branch mainline in revision 9615.
  • Revision ID: jml@canonical.com-20090920104125-dgtt2944zscdsia6
Extract a merge proposal wrapper class out of the functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/devscripts/ec2test/builtins.py
16
16
 
17
17
import socket
18
18
 
19
 
from devscripts.autoland import (
20
 
    get_email, get_lp_commit_message, LaunchpadBranchLander)
 
19
from devscripts.autoland import LaunchpadBranchLander
21
20
 
22
21
from devscripts.ec2test.credentials import EC2Credentials
23
22
from devscripts.ec2test.instance import (
308
307
            raise BzrCommandError(
309
308
                "Commit text not specified. Use --commit-text, or specify a "
310
309
                "message on the merge proposal.")
311
 
        commit_message = get_lp_commit_message(mp, commit_text)
312
 
        source_url = lander.get_push_url(mp.source_branch)
313
 
        target_url = lander.get_push_url(mp.target_branch)
 
310
        commit_message = mp.get_commit_message(commit_text)
314
311
        # XXX: maybe make a version that just does a pqm-submit w/ no tests
315
312
        # XXX: maybe make a version that only tests
316
313
        self.land_branch(
317
 
            source_url, target_url, commit_message,
318
 
            map(get_email, lander.get_stakeholders(mp)))
 
314
            mp.source_branch, mp.target_branch, commit_message,
 
315
            mp.get_stakeholder_emails())
319
316
 
320
317
 
321
318
class cmd_demo(EC2Command):