← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_propose.py

  • Committer: Martin Packman
  • Date: 2012-01-05 10:37:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105103758-wzftnmsip5iv9n2g
Revert addition of get_message_encoding function

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_propose.py
25
25
from bzrlib import (
26
26
    msgeditor,
27
27
    )
 
28
from bzrlib.i18n import gettext
28
29
from bzrlib.plugins.launchpad import (
29
30
    lp_api,
30
31
    lp_registration,
142
143
            if mp.queue_status in ('Merged', 'Rejected'):
143
144
                continue
144
145
            if mp.target_branch.self_link == self.target_branch.lp.self_link:
145
 
                raise errors.BzrCommandError(
146
 
                    'There is already a branch merge proposal: %s' %
 
146
                raise errors.BzrCommandError(gettext(
 
147
                    'There is already a branch merge proposal: %s') %
147
148
                    lp_api.canonical_url(mp))
148
149
 
149
150
    def _get_prerequisite_branch(self):