1374
Comment:
|
2411
Add info about using unencrypted credential storage.
|
Deletions are marked like this. | Additions are marked like this. |
Line 14: | Line 14: |
{{{ ./utilities/ec2 land }}} |
|
Line 15: | Line 18: |
./utilities/ec2 land This finds the merge proposal and infers the target branch, adds the correct reviewer etc. information, and commit message. It relies on having an approved merge proposal with the commit message set. |
This finds the merge proposal, infers the target branch, and then runs the test suite for you. If the suite passes it will add the correct reviewer and tags to the commit message, then submit the branch to PQM on your behalf. In order for this to work your branch must have an approved merge proposal with the commit message set. (Don't worry, the tool will warn you right away if these conditions aren't met.) |
Line 23: | Line 22: |
{{{ ./utilities/ec2 land <URL of merge proposal> }}} or, if the branch has exactly one merge proposal, {{{ ./utilities/ec2 land lp:~user/launchpad/branch-name }}} |
|
Line 24: | Line 30: |
./utilities/ec2 land lp:~user/launchpad/branch-name | Run `./utilities/ec2 land --help` to see the full list of command-line options. === Credential storage === Launchpadlib (which bin/ec2 uses) stores credentials using the python-keyring library. By default it will use GNOME or KDE keyring/wallet providers. If those aren't available it will use a password-encrypted file. If you would instead like to forgo those storages (and any prompts they generate as well as the safety of encrypted credentials) you can create a ~/keyringrc.cfg file with these contents: {{{ [backend] default-keyring=keyring.backend.UncryptedFileKeyring }}} |
Line 33: | Line 55: |
{{{ | |
Line 36: | Line 58: |
}}} Again, from any copy of a launchpad branch run {{{ bzr lp-land }}} and it will infer the details from the approved merge proposal. |
|
Line 37: | Line 65: |
Again, from any copy of a launchpad branch run bzr lp-land and it will infer the details from the approved merge proposal. |
Run `bzr lp-land --help` to see the full list of command-line options. |
Landing Changes
This page describes how a developer with PQM access can land a change.
Using ec2
To run the tests on ec2 before submitting to PQM to try and ensure you won't break the build use ./utilities/ec2. To use this you must be setup to use EC2Test.
From a local branch of the code that you want to submit (which should have a public branch set (TODO: link to documentation of how to set that stuff up)) simply run
./utilities/ec2 land
This finds the merge proposal, infers the target branch, and then runs the test suite for you. If the suite passes it will add the correct reviewer and tags to the commit message, then submit the branch to PQM on your behalf. In order for this to work your branch must have an approved merge proposal with the commit message set. (Don't worry, the tool will warn you right away if these conditions aren't met.)
If you want to land someone elses branch on their behalf then you can run, from any LP branch,
./utilities/ec2 land <URL of merge proposal>
or, if the branch has exactly one merge proposal,
./utilities/ec2 land lp:~user/launchpad/branch-name
Run ./utilities/ec2 land --help to see the full list of command-line options.
Credential storage
Launchpadlib (which bin/ec2 uses) stores credentials using the python-keyring library. By default it will use GNOME or KDE keyring/wallet providers. If those aren't available it will use a password-encrypted file.
If you would instead like to forgo those storages (and any prompts they generate as well as the safety of encrypted credentials) you can create a ~/keyringrc.cfg file with these contents:
[backend] default-keyring=keyring.backend.UncryptedFileKeyring
Using lp-land
If you have the bzr-pqm plugin installed then you can use the "lp-land" command, which works in a similar way to "ec2 land", but doesn't run the testsuite first.
First ensure that you have the PQM submission address set for your launchpad branches in ~/.bazaar/locations.conf
[/home/user/launchpad/] pqm_email = Canonical PQM <launchpad@pqm.canonical.com>
Again, from any copy of a launchpad branch run
bzr lp-land
and it will infer the details from the approved merge proposal.
Run bzr lp-land --help to see the full list of command-line options.