Rev 6619: (richard-wilbur) Use initial_comment as commit_message for lp_propose.(Shawn in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6619 [merge]
revision-id: pqm at pqm.ubuntu.com-20160421050657-ygnzfybewvudf1j9
parent: pqm at pqm.ubuntu.com-20160421043902-skyc5cmuqnh1b9la
parent: shawn.wang at canonical.com-20150525034210-l3c01l2mdw0dvq6b
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2016-04-21 05:06:57 +0000
message:
  (richard-wilbur) Use initial_comment as commit_message for lp_propose.(Shawn
   Wang) (Shawn Wang)
modified:
  bzrlib/plugins/launchpad/lp_propose.py lp_submit.py-20100120065117-penrmqruf596pui6-1
=== modified file 'bzrlib/plugins/launchpad/lp_propose.py'
--- a/bzrlib/plugins/launchpad/lp_propose.py	2012-10-22 16:25:40 +0000
+++ b/bzrlib/plugins/launchpad/lp_propose.py	2015-05-25 03:42:10 +0000
@@ -94,6 +94,8 @@
 
     def get_comment(self, prerequisite_branch):
         """Determine the initial comment for the merge proposal."""
+        if self.commit_message is not None:
+            return self.commit_message.strip().encode('utf-8')
         info = ["Source: %s\n" % self.source_branch.lp.bzr_identity]
         info.append("Target: %s\n" % self.target_branch.lp.bzr_identity)
         if prerequisite_branch is not None: