← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/browser/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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/browser/branch.py
47
47
    )
48
48
from lazr.uri import URI
49
49
import pytz
50
 
import simplejson
51
50
from zope.app.form.browser import TextAreaWidget
52
51
from zope.component import (
53
52
    getUtility,
838
837
    def mirror_of_ssh(self):
839
838
        """True if this a mirror branch with an sftp or bzr+ssh URL."""
840
839
        if not self.context.url:
841
 
            return False # not a mirror branch
 
840
            return False  # not a mirror branch
842
841
        uri = URI(self.context.url)
843
842
        return uri.scheme in ('sftp', 'bzr+ssh')
844
843
 
994
993
 
995
994
    @action('Upgrade', name='upgrade_branch')
996
995
    def upgrade_branch_action(self, action, data):
997
 
        self.context.requestUpgrade()
 
996
        self.context.requestUpgrade(self.user)
998
997
 
999
998
 
1000
999
class BranchEditView(BranchEditFormView, BranchNameValidationMixin):