← 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: Shawn Wang
  • Date: 2015-05-25 03:42:10 UTC
  • mto: This revision was merged to the branch mainline in revision 6619.
  • Revision ID: shawn.wang@canonical.com-20150525034210-l3c01l2mdw0dvq6b
use initial_comment as commit_message for lp_propose

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_propose.py
94
94
 
95
95
    def get_comment(self, prerequisite_branch):
96
96
        """Determine the initial comment for the merge proposal."""
 
97
        if self.commit_message is not None:
 
98
            return self.commit_message.strip().encode('utf-8')
97
99
        info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]
98
100
        info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)
99
101
        if prerequisite_branch is not None: