← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/interfaces/branch.py

Committer: Jelmer Vernooij
Date: 2011-08-22 21:04:00 UTC
mfrom: (13261.7.21 bzr-2.4b4)
mto: This revision was merged to the branch mainline in revision 13941.
Revision ID: jelmer@canonical.com-20110822210400-3hfq31q2wgrtauad

Merge bzr-2.4b4.

files added:
lib/canonical/launchpad/daemons/tests/okay.tac

lib/canonical/launchpad/webapp/tests/test_vocabulary.py

lib/lp/app/browser/tests/test_macro_view.py

lib/lp/code/javascript/tests/test_requestbuild_overlay.html

lib/lp/code/javascript/tests/test_requestbuild_overlay.js

lib/lp/soyuz/scripts/custom_uploads_copier.py

lib/lp/soyuz/scripts/tests/test_custom_uploads_copier.py

files removed:
lib/canonical/launchpad/scripts/ftests/test_keyringtrustanalyser.py

lib/gpgme

lib/lp/registry/scripts/keyringtrustanalyser.py

scripts/find-email-clusters.py

scripts/merge-email-clusters.py

files modified:
cronscripts/process-job-source.py

database/schema/security.cfg

lib/canonical/buildd/debian/changelog

lib/canonical/buildd/debian/postinst

lib/canonical/launchpad/daemons/tachandler.py

lib/canonical/launchpad/daemons/tests/cannotlisten.tac

lib/canonical/launchpad/daemons/tests/test_tachandler.py

lib/canonical/launchpad/icing/style-3-0.css

lib/canonical/launchpad/interfaces/gpghandler.py

lib/canonical/launchpad/security.py

lib/canonical/launchpad/utilities/ftests/test_gpghandler.py

lib/canonical/launchpad/utilities/gpghandler.py

lib/canonical/launchpad/vocabularies/dbobjects.py

lib/canonical/launchpad/webapp/vocabulary.py

lib/canonical/launchpad/zcml/feeds.zcml

lib/canonical/librarian/testing/server.py

lib/canonical/testing/layers.py

lib/launchpad_loggerhead/app.py

lib/launchpad_loggerhead/tests.py

lib/lp/answers/stories/question-add.txt

lib/lp/answers/templates/question-index.pt

lib/lp/answers/vocabulary.py

lib/lp/app/browser/configure.zcml

lib/lp/app/browser/launchpad.py

lib/lp/app/browser/tests/test_vocabulary.py

lib/lp/app/browser/vocabulary.py

lib/lp/app/javascript/formoverlay/formoverlay.js

lib/lp/app/javascript/formoverlay/tests/test_formoverlay.js

lib/lp/app/javascript/picker/picker.js

lib/lp/app/javascript/picker/picker_patcher.js

lib/lp/app/javascript/picker/tests/test_picker.js

lib/lp/app/javascript/picker/tests/test_picker_patcher.js

lib/lp/app/javascript/testing/iorecorder.js

lib/lp/app/widgets/configure.zcml

lib/lp/app/widgets/popup.py

lib/lp/app/widgets/templates/form-picker-macros.pt

lib/lp/app/widgets/tests/test_popup.py

lib/lp/app/widgets/tests/test_suggestion.py

lib/lp/archivepublisher/scripts/publish_ftpmaster.py

lib/lp/archivepublisher/tests/test_publish_ftpmaster.py

lib/lp/archiveuploader/nascentupload.py

lib/lp/bugs/browser/configure.zcml

lib/lp/bugs/configure.zcml

lib/lp/bugs/model/bugtask.py

lib/lp/bugs/model/tests/test_bugsummary.py

lib/lp/bugs/model/tests/test_bugtask.py

lib/lp/code/browser/branch.py

lib/lp/code/browser/configure.zcml

lib/lp/code/interfaces/branch.py

lib/lp/code/javascript/requestbuild_overlay.js

lib/lp/code/model/branch.py

lib/lp/code/model/branchjob.py

lib/lp/code/model/tests/test_branch.py

lib/lp/code/model/tests/test_branchjob.py

lib/lp/code/scripts/tests/test_merge_proposal_jobs.py

lib/lp/code/scripts/tests/test_upgrade_branches.py

lib/lp/code/templates/sourcepackagerecipe-index.pt

lib/lp/code/vocabularies/branch.py

lib/lp/codehosting/codeimport/tests/servers.py

lib/lp/codehosting/codeimport/tests/test_worker.py

lib/lp/codehosting/codeimport/tests/test_workermonitor.py

lib/lp/registry/browser/configure.zcml

lib/lp/registry/browser/distroseries.py

lib/lp/registry/browser/tests/test_distroseries.py

lib/lp/registry/configure.zcml

lib/lp/registry/interfaces/distroseries.py

lib/lp/registry/javascript/distroseriesdifferences_details.js

lib/lp/registry/model/distroseries.py

lib/lp/registry/model/pillaraffiliation.py

lib/lp/registry/templates/distroseries-portlet-derivation.pt

lib/lp/registry/tests/test_pillar_vocabularies.py

lib/lp/registry/tests/test_pillaraffiliation.py

lib/lp/registry/vocabularies.py

lib/lp/registry/vocabularies.zcml

lib/lp/scripts/tests/test_garbo.py

lib/lp/services/job/runner.py

lib/lp/services/job/tests/test_runner.py

lib/lp/soyuz/browser/configure.zcml

lib/lp/soyuz/configure.zcml

lib/lp/soyuz/doc/archivepermission.txt

lib/lp/soyuz/interfaces/archivepermission.py

lib/lp/soyuz/model/binarypackagereleasecontents.py

lib/lp/soyuz/scripts/initialize_distroseries.py

lib/lp/soyuz/scripts/packagecopier.py

lib/lp/soyuz/scripts/tests/test_copypackage.py

lib/lp/soyuz/stories/webservice/xx-archive.txt

lib/lp/soyuz/tests/test_archive.py

lib/lp/soyuz/tests/test_publishing.py

lib/lp/testing/__init__.py

lib/lp/translations/browser/configure.zcml

lib/lp/translations/model/translationsperson.py

lib/lp/translations/templates/potemplate-chart.pt

lib/lp/translations/tests/test_translations_to_review.py

setup.py

utilities/rocketfuel-mp-status

utilities/sourcedeps.cache

utilities/sourcedeps.conf

versions.cfg

Show diffs side-by-side

added added

removed removed

lib/lp/code/interfaces/branch.py

1063

1063

adapted to an IBranchTarget.

1064

1064

"""

1065

1065

1066

def requestUpgrade():

1066

def requestUpgrade(requester):

1067

1067

"""Create an IBranchUpgradeJob to upgrade this branch."""

1068

1068

1069

1069

def branchChanged(stacked_on_url, last_revision_id, control_format,

Older »