Merge lp:~jelmer/bzr-builddeb/dep3-patch-c into lp:bzr-builddeb

[Jelmer Vernooij]

Add a -c option to 'bzr dep3-patch'.

[James Westby (james-w)]

review: Approve

[lp:~jelmer/bzr-builddeb/dep3-patch-c]

575. By Jelmer Vernooij on 2011-06-23

Merge support for -c argument to 'bzr dep3-patch'.

=== modified file 'cmds.py'
--- cmds.py	2011-06-16 21:02:32 +0000
+++ cmds.py	2011-06-21 20:57:30 +0000
@@ -1234,7 +1234,7 @@
     no_upstream_check_opt = Option('no-upstream-check',
         help="Don't check whether patch has been merged upstream.")
 
-    takes_options = [directory_opt, "revision", no_upstream_check_opt]
+    takes_options = [directory_opt, "revision", "change", no_upstream_check_opt]
 
     def run(self, location, directory=".", revision=None, no_upstream_check=False):
         from bzrlib.plugins.builddeb.dep3 import (
@@ -1259,17 +1259,23 @@
             else:
                 base_revid = graph.find_unique_lca(revision_id,
                     packaging_branch.last_revision())
-            interesting_revision_ids = graph.find_unique_ancestors(revision_id, [base_revid])
+            interesting_revision_ids = graph.find_unique_ancestors(revision_id,
+                [base_revid])
             if len(interesting_revision_ids) == 0:
                 raise BzrCommandError("No unmerged revisions")
             (bugs, authors, last_update) = gather_bugs_and_authors(branch.repository,
                 interesting_revision_ids)
             config = branch.get_config()
             description = config.get_user_option("description")
-            if description is None and len(interesting_revision_ids) == 1:
-                # if there's just one revision, use that revisions commits message
-                rev = branch.repository.get_revision(iter(interesting_revision_ids).next())
-                description = rev.message
+            if description is None:
+                # if there's just one revision in the mainline history, use
+                # that revisions commits message
+                lhs_history = graph.iter_lefthand_ancestry(revision_id, [base_revid])
+                rev = branch.repository.get_revision(lhs_history.next())
+                try:
+                    lhs_history.next()
+                except StopIteration:
+                    description = rev.message
             origin = describe_origin(branch, revision_id)
             if packaging_tree is None:
                 packaging_tree = packaging_branch.basis_tree()
 
=== modified file 'tests/blackbox/test_dep3.py'
--- tests/blackbox/test_dep3.py	2011-05-08 10:47:40 +0000
+++ tests/blackbox/test_dep3.py	2011-06-21 20:57:30 +0000
@@ -51,7 +51,7 @@
         self.feature_tree.commit(message="A message", timestamp=1304850124,
             timezone=0, authors=["Jelmer <[e-mail]>"], rev_id="therevid")
         (out, err) = self.run_bzr("dep3-patch -d packaging feature")
-        self.assertEquals(out, "Description: A message\n"
+        self.assertEqualDiff(out, "Description: A message\n"
             "Origin: commit, revision id: therevid\n"
             "Author: Jelmer <[e-mail]>\n"
             "Last-Update: 2011-05-08\n"
@@ -102,3 +102,27 @@
         self.feature_tree.commit(message="a message")
         (out, err) = self.run_bzr("dep3-patch --no-upstream-check -d packaging feature")
         self.assertNotContainsRe(out, "Applied-Upstream")
+
+    def test_range(self):
+        # A range of revisions can be specified.
+        self.build_tree_contents([("feature/foo", "bar\n")])
+        self.feature_tree.add("foo")
+        self.feature_tree.commit(message="Another message", timestamp=1304850124,
+            timezone=0, authors=["Jelmer <[e-mail]>"], rev_id="baserevid")
+        self.build_tree_contents([("feature/foo", "bla\n")])
+        self.feature_tree.commit(message="A message", timestamp=1304850124,
+            timezone=0, authors=["Jelmer <[e-mail]>"], rev_id="therevid")
+        (out, err) = self.run_bzr("dep3-patch -c -1 -d packaging feature")
+        self.assertEqualDiff(out, "Description: A message\n"
+            "Origin: commit, revision id: therevid\n"
+            "Author: Jelmer <[e-mail]>\n"
+            "Last-Update: 2011-05-08\n"
+            "X-Bzr-Revision-Id: therevid\n"
+            "\n"
+            "=== modified file 'foo'\n"
+            "--- old/foo\t2011-05-08 10:22:04 +0000\n"
+            "+++ new/foo\t2011-05-08 10:22:04 +0000\n"
+            "@@ -1,1 +1,1 @@\n"
+            "-bar\n"
+            "+bla\n"
+            "\n")