Merge lp:~jelmer/bzr-builddeb/get-orig-source-options into lp:bzr-builddeb

[Jelmer Vernooij]

Support -d argument to get-orig-source, and add an optional version argument.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-11-26 15:01:25 +0000
+++ cmds.py	2011-11-30 16:45:28 +0000
@@ -466,8 +466,15 @@
 class cmd_get_orig_source(Command):
     """Gets the upstream tar file for the packaging branch."""
 
-    def run(self):
-        tree = WorkingTree.open_containing('.')[0]
+    directory_opt = Option('directory',
+        help='Directory from which to retrieve the packaging data',
+        short_name='d', type=unicode)
+
+    takes_options = [directory_opt]
+    takes_args = ["version?"]
+
+    def run(self, directory='.', version=None):
+        tree = WorkingTree.open_containing(directory)[0]
         config = debuild_config(tree, tree)
 
         (changelog, larstiq) = find_changelog(tree, True)
@@ -475,8 +482,11 @@
         if orig_dir is None:
             orig_dir = default_orig_dir
 
+        if version is None:
+            version = changelog.version.upstream_version
+
         upstream_provider = UpstreamProvider(changelog.package,
-                changelog.version.upstream_version, orig_dir,
+                str(version), orig_dir,
                 [PristineTarSource(tree, tree.branch),
                  AptSource(),
                  GetOrigSourceSource(tree, larstiq),

=== modified file 'tests/blackbox/test_get_tar.py'
--- tests/blackbox/test_get_tar.py	2011-10-03 10:49:13 +0000
+++ tests/blackbox/test_get_tar.py	2011-11-30 16:45:28 +0000
@@ -19,7 +19,6 @@
 #
 
 import os
-import tarfile
 
 try:
     from debian.changelog import (Changelog,
@@ -67,21 +66,19 @@
         tree.add(source_files)
         return tree
 
-    def make_source_with_upstream(self):
+    def make_source_with_upstream(self, path="."):
         """Create a source tree in a branch with an upstream tag."""
-        tree = self.make_branch_and_tree('.')
+        tree = self.make_branch_and_tree(path)
         source_files = ['README']
-        self.build_tree(source_files)
+        self.build_tree([os.path.join(path, f) for f in source_files])
         tree.add(source_files)
         tree.commit("one", rev_id='revid1')
         tree.branch.tags.set_tag("upstream-0.1", tree.branch.last_revision())
 
-        cl_file = 'debian/changelog'
-        source_files = ['debian/'] + [cl_file]
-        self.build_tree(source_files)
+        os.mkdir(os.path.join(path, 'debian'))
         c = self.make_changelog()
-        self.write_changelog(c, cl_file)
-        tree.add(source_files)
+        self.write_changelog(c, os.path.join(path, 'debian/changelog'))
+        tree.add(['debian', 'debian/changelog'])
         tree.commit("two", rev_id='revid2')
         return tree
 
@@ -104,3 +101,22 @@
         tree = self.make_source_with_upstream()
         self.run_bzr(['get-orig-source'])
         self.assertPathExists('../test_0.1.orig.tar.gz')
+
+    def test_get_orig_source_directory(self):
+        tree = self.make_source_with_upstream("somedir")
+        self.run_bzr(['get-orig-source', '-d', 'somedir'])
+        self.assertPathExists('../test_0.1.orig.tar.gz')
+
+    def test_get_orig_source_explicit_version(self):
+        tree = self.make_source_with_upstream()
+        c = self.make_changelog("0.3-1")
+        self.write_changelog(c, 'debian/changelog')
+        tree.commit("package 0.3")
+        self.run_bzr(['get-orig-source', '0.1'])
+        self.assertPathExists('../test_0.1.orig.tar.gz')
+
+    def test_get_orig_source_explicit_version_not_found(self):
+        tree = self.make_source_with_upstream()
+        self.run_bzr_error([
+            'bzr: ERROR: Unable to find the needed upstream tarball for package test, version 0.3.'],
+            'get-orig-source 0.3')