Merge lp:~jelmer/bzr-builddeb/dep3-fixes into lp:bzr-builddeb

[Jelmer Vernooij]

Some fixes for 'bzr dep3-patch':

 * Allow open ended revision ranges (-r-4..)
 * Support extracting patches from remote repositories

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-11-10 18:44:05 +0000
+++ cmds.py	2011-11-26 15:11:23 +0000
@@ -1301,51 +1301,51 @@
             )
         packaging_tree, packaging_branch = BzrDir.open_containing_tree_or_branch(
             directory)[:2]
+        self.add_cleanup(packaging_branch.lock_read().unlock)
         tree, branch = BzrDir.open_containing_tree_or_branch(location)[:2]
-        branch.lock_read()
-        try:
-            if revision is not None and len(revision) >= 1:
-                revision_id = revision[-1].as_revision_id(branch)
-            else:
-                revision_id = branch.last_revision()
-            graph = branch.repository.get_graph(packaging_branch.repository)
-            if revision is not None and len(revision) == 2:
-                base_revid = revision[0].as_revision_id(branch)
-            else:
-                base_revid = graph.find_unique_lca(revision_id,
-                    packaging_branch.last_revision())
-            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:
-                # 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()
-            builddeb_config = debuild_config(packaging_tree, True)
-            if not no_upstream_check and builddeb_config.upstream_branch:
-                upstream_branch = Branch.open(builddeb_config.upstream_branch)
-                applied_upstream = determine_applied_upstream(upstream_branch, branch,
-                    revision_id)
-                forwarded = determine_forwarded(upstream_branch, branch, revision_id)
-            else:
-                applied_upstream = None
-                forwarded = None
-            write_dep3_patch(self.outf, branch, base_revid,
-                revision_id, bugs=bugs, authors=authors, origin=origin,
-                forwarded=forwarded, applied_upstream=applied_upstream,
-                description=description, last_update=last_update)
-        finally:
-            branch.unlock()
+        self.add_cleanup(branch.lock_read().unlock)
+        if revision is not None and len(revision) >= 1:
+            revision_id = revision[-1].as_revision_id(branch)
+        else:
+            revision_id = None
+        if revision_id is None:
+            revision_id = branch.last_revision()
+        graph = branch.repository.get_graph(packaging_branch.repository)
+        if revision is not None and len(revision) == 2:
+            base_revid = revision[0].as_revision_id(branch)
+        else:
+            base_revid = graph.find_unique_lca(revision_id,
+                packaging_branch.last_revision())
+        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:
+            # 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()
+        builddeb_config = debuild_config(packaging_tree, True)
+        if not no_upstream_check and builddeb_config.upstream_branch:
+            upstream_branch = Branch.open(builddeb_config.upstream_branch)
+            applied_upstream = determine_applied_upstream(upstream_branch, branch,
+                revision_id)
+            forwarded = determine_forwarded(upstream_branch, branch, revision_id)
+        else:
+            applied_upstream = None
+            forwarded = None
+        write_dep3_patch(self.outf, branch, base_revid,
+            revision_id, bugs=bugs, authors=authors, origin=origin,
+            forwarded=forwarded, applied_upstream=applied_upstream,
+            description=description, last_update=last_update)

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-22 14:05:25 +0000
+++ debian/changelog	2011-11-26 15:11:23 +0000
@@ -23,8 +23,10 @@
   * Support --revision argument to merge-package. LP: #888590
   * By default, don't override the commit message from debian/changelog
     unless 'commit-message-from-changelog' is explicitly set to True. LP: #812749
+  * Support running dep3-patch against remote repositories, and with
+    open-ended revision ranges. LP: #893608
 
- -- Jelmer Vernooij <[e-mail]>  Tue, 22 Nov 2011 12:04:47 +0100
+ -- Jelmer Vernooij <[e-mail]>  Sat, 26 Nov 2011 16:01:16 +0100
 
 bzr-builddeb (2.7.9) unstable; urgency=low
 

=== modified file 'tests/blackbox/test_dep3.py'
--- tests/blackbox/test_dep3.py	2011-06-21 20:55:13 +0000
+++ tests/blackbox/test_dep3.py	2011-11-26 15:11:23 +0000
@@ -126,3 +126,11 @@
             "-bar\n"
             "+bla\n"
             "\n")
+
+    def test_open_ended_range(self):
+        # If there is a single revision the commit message from
+        # that revision will be used.
+        self.feature_tree.commit(message="A message", timestamp=1304850124,
+            timezone=0, authors=["Jelmer <[e-mail]>"])
+        (out, err) = self.run_bzr("dep3-patch -d packaging feature -r-2..")
+        self.assertContainsRe(out, "Description: A message\n")