Add urgency management.

* tests/11_test_dch_main.py: test the new --urgency option to
  dch.main(). Add only meaningful tests, i.e. options alone and combined
  with --release and --snapshot.

* git-dch (fixup_section): Manage "urgency" option.
  (main): Add version_group option "-U" and "--urgency" to set the
  urgency level of the entry.

* docs/manpages/git-dch.sgml: Update documentation for new option.

3 files changed, 40 insertions, 1 deletions

diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml
index 0cccf09e..8f4bae1c 100644
--- a/docs/manpages/git-dch.sgml
+++ b/docs/manpages/git-dch.sgml
@@ -43,6 +43,7 @@
       </group>
       <arg><option>--distribution=</option><replaceable>name</replaceable></arg>
       <arg><option>--force-distribution</option></arg>
+      <arg><option>--urgency=</option><replaceable>level</replaceable></arg>
       <arg><option>--[no-]full</option></arg>
       <arg><option>--[no-]meta</option></arg>
       <arg><option>--meta-closes=bug-close-tags</option></arg>
@@ -240,6 +241,14 @@
 	</listitem>
       </varlistentry>
       <varlistentry>
+	<term><option>--urgency=</option><replaceable>level</replaceable>
+	</term>
+	<listitem>
+	  <para>Set the urgency field
+	  to <replaceable>level</replaceable>.</para>
+	</listitem>
+      </varlistentry>
+      <varlistentry>
         <term><option>--git-log=</option><replaceable>git-log-options</replaceable>
         </term>
         <listitem>
diff --git a/gbp/scripts/dch.py b/gbp/scripts/dch.py
index c06fb501..66da519b 100644
--- a/gbp/scripts/dch.py
+++ b/gbp/scripts/dch.py
@@ -72,7 +72,7 @@ def fixup_section(repo, git_author, options, dch_options):
     This apply --distribution and --urgency options passed to git-dch
     """
     author, email = get_author_email(repo, git_author)
-    used_options = ['distribution']
+    used_options = ['distribution', 'urgency']
     header_opts = []
 
     # This must not be done for snapshots or snapshots changelog entries
@@ -318,6 +318,7 @@ def main(argv):
                       help="Force the provided distribution to be used, even if it doesn't match the list of known distributions")
     version_group.add_option("-N", "--new-version", dest="new_version",
                       help="use this as base for the new version number")
+    version_group.add_option("-U", "--urgency", dest="urgency", help="Set urgency level")
     version_group.add_option("--bpo", dest="bpo", action="store_true", default=False,
                       help="Increment the Debian release number for an upload to backports, and add a backport upload changelog comment.")
     version_group.add_option("--nmu", dest="nmu", action="store_true", default=False,
diff --git a/tests/11_test_dch_main.py b/tests/11_test_dch_main.py
index 36431ef7..e43709c3 100644
--- a/tests/11_test_dch_main.py
+++ b/tests/11_test_dch_main.py
@@ -267,6 +267,35 @@ class TestScriptDch(DebianGitTestRepo):
         self.assertIn("""  * TEST-COMMITTED-SNAPSHOT\n""", lines)
 
 
+    def test_dch_main_new_upstream_version_with_urgency(self):
+        """Test dch.py like git-dch script does: new upstream version - set urgency"""
+        options = ["--urgency=emergency"]
+        lines = self.run_dch(options)
+        self.assertEqual("test-package (1.0-1) UNRELEASED; urgency=emergency\n", lines[0])
+        self.assertIn("""  * added debian/control\n""", lines)
+
+
+    def test_dch_main_new_upstream_version_with_release_urgency(self):
+        """Test dch.py like git-dch script does: new upstream version - release - set urgency"""
+        options = ["--release"]
+        options.append("--urgency=emergency")
+        lines = self.run_dch(options)
+        self.assertEqual("test-package (1.0-1) unstable; urgency=emergency\n", lines[0])
+        self.assertIn("""  * added debian/control\n""", lines)
+
+
+    def test_dch_main_new_upstream_version_with_snapshot_urgency(self):
+        """Test dch.py like git-dch script does: new upstream version - snapshot mode - set urgency"""
+        options = ["--snapshot"]
+        options.append("--urgency=emergency")
+        lines = self.run_dch(options)
+        header = re.search(snap_header_1, lines[0])
+        self.assertIsNotNone(header)
+        self.assertEqual(header.lastindex, 1)
+        self.assertIsNotNone(re.search(snap_mark + header.group(1), lines[2]))
+        self.assertIn("""  * added debian/control\n""", lines)
+
+
     def test_dch_main_increment_debian_version(self):
         """Test dch.py like git-dch script does: increment debian version"""
         self.repo.delete_tag("debian/0.9-1")