Merge lp:~jr/bzr-builddeb/config-option-commit-message-from-changelog into lp:bzr-builddeb

[Jonathan Riddell]

  * Add commit-message-from-changelog option for those who do not
    want commit message set automatically

[lp:~jr/bzr-builddeb/config-option-commit-message-from-changelog]

626. By Jonathan Riddell on 2011-10-07

add doc for commit-message-from-changelog

627. By Jonathan Riddell on 2011-10-07

add test for commit-message-from-changelog option

[James Westby (james-w)]

Looks great, thanks.

James

review: Approve

=== modified file '__init__.py'
--- __init__.py	2011-10-06 09:51:05 +0000
+++ __init__.py	2011-10-07 11:49:35 +0000
@@ -116,6 +116,12 @@
      Set the commit message from debian/changelog and set any LP: #1234 to bug
      fixed tags."""
     from bzrlib.plugins.builddeb.util import find_bugs_fixed
+    from bzrlib.plugins.builddeb.util import debuild_config
+
+    t = commit.work_tree
+    config = debuild_config(t, False)
+    if config.commit_message_from_changelog == False:
+        return None
 
     changes = debian_changelog_commit_message(commit, start_message)
     if changes is None:
 
=== modified file 'config.py'
--- config.py	2011-02-03 10:24:21 +0000
+++ config.py	2011-10-07 11:49:35 +0000
@@ -290,6 +290,9 @@
   export_upstream_revision = _opt_property('export-upstream-revision',
                          "The revision of the upstream source to use.")
 
+  commit_message_from_changelog = _bool_property('commit-message-from-changelog',
+                                    "Whether the commit message should come from debian/changelog", default=True)
+
 
 def _test():
   import doctest
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-10-03 11:34:13 +0000
+++ debian/changelog	2011-10-07 11:49:35 +0000
@@ -4,6 +4,8 @@
   * Add get-orig-source command which will get the upstream tar file.
     LP: #862188
   * Change "bd-do" command to "builddeb-do" and alias "bd-do".
+  * Add commit-message-from-changelog option for those who do not
+    want commit message set automatically
 
  -- Jonathan Riddell <[e-mail]>  Mon, 03 Oct 2011 12:28:54 +0100
 
 
=== modified file 'doc/user_manual/configuration.rst'
--- doc/user_manual/configuration.rst	2011-03-04 18:29:16 +0000
+++ doc/user_manual/configuration.rst	2011-10-07 11:49:35 +0000
@@ -113,6 +113,14 @@
     upstream code. This has no effect if ``upstream-branch`` is not set.
 
 
+Committing
+^^^^^^^^^^
+
+bzr-builddeb will set the commit message from debian/changelog.  If you do not
+want this set::
+
+  * ``commit-message-from-changelog = false``
+
 Builders
 ^^^^^^^^
 
 
=== modified file 'tests/test_commit_message.py'
--- tests/test_commit_message.py	2011-09-29 17:27:40 +0000
+++ tests/test_commit_message.py	2011-10-07 11:49:35 +0000
@@ -100,6 +100,24 @@
         self.assertEqual(debian_changelog_commit_message(commit, None),
                 "* two\n* changes\n")
 
+    def test_no_set_message_config_option(self):
+        wt = self.make_branch_and_tree(".")
+        self.build_tree(['a', 'debian/', 'debian/changelog', '.bzr-builddeb/', '.bzr-builddeb/default.conf'])
+        f = open(".bzr-builddeb/default.conf", 'wb')
+        try:
+            f.write("[BUILDDEB]\ncommit-message-from-changelog = false")
+        finally:
+            f.close()
+        wt.add(['debian/', 'debian/changelog', '.bzr-builddeb/', '.bzr-builddeb/default.conf'])
+        wt.commit("one")
+        self.set_changelog_content("  * a change\n")
+        wt.add(['a'])
+        wt.lock_read()
+        self.addCleanup(wt.unlock)
+        commit = self._Commit(wt)
+        self.assertEqual(debian_changelog_commit(commit, None),
+                None)
+
     def test_set_message_with_bugs(self):
         wt = self.make_branch_and_tree(".")
         self.build_tree(['a', 'debian/', 'debian/changelog'])