Merge lp:~jelmer/bzr-builddeb/import-upstream-revision into lp:bzr-builddeb

[Jelmer Vernooij]

Add -r support to import-upstream.

=== modified file 'cmds.py'
--- cmds.py	2010-05-06 14:30:28 +0000
+++ cmds.py	2010-05-28 00:49:26 +0000
@@ -779,10 +779,12 @@
     import and the tip of the upstream branch if you supply one.
     """
 
+    takes_options = ['revision']
+
     takes_args = ['version', 'location', 'upstream_branch?']
 
-    def run(self, version, location, upstream_branch=None):
-        # TODO: support -r, search for similarity etc.
+    def run(self, version, location, upstream_branch=None, revision=None):
+        # TODO: search for similarity etc.
         version = version.encode('utf8')
         branch, _ = Branch.open_containing('.')
         if upstream_branch is None:
@@ -810,7 +812,7 @@
             parents = []
         if parents:
             # See bug lp:309682
-            db.upstream_branch.repository.fetch(branch.repository, parents[0])
+            upstream.repository.fetch(branch.repository, parents[0])
             db.extract_upstream_tree(parents[0], tempdir)
         else:
             db._create_empty_upstream_tree(tempdir)
@@ -818,8 +820,15 @@
         tree.lock_read()
         dbs = DistributionBranchSet()
         dbs.add_branch(db)
+        if revision is None:
+            upstream_revid = None
+        elif len(revision) == 1:
+            upstream_revid = revision[0].in_history(upstream).rev_id
+        else:
+            raise BzrCommandError('bzr import-upstream --revision takes exactly'
+                                  ' one revision specifier.')
         tag_name, _ = db.import_upstream_tarball(location, version, parents,
-            upstream_branch=upstream)
+            upstream_branch=upstream, upstream_revision=upstream_revid)
         self.outf.write('Imported %s as tag:%s.\n' % (location, tag_name))
 
 

=== modified file 'import_dsc.py'
--- import_dsc.py	2010-05-05 07:20:17 +0000
+++ import_dsc.py	2010-05-28 00:49:26 +0000
@@ -993,7 +993,7 @@
         return tag_name, revid
 
     def import_upstream_tarball(self, tarball_filename, version, parents,
-        md5sum=None, upstream_branch=None):
+        md5sum=None, upstream_branch=None, upstream_revision=None):
         """Import an upstream part to the upstream branch.
 
         :param tarball_filename: The tarball to import.
@@ -1003,6 +1003,7 @@
             parents.
         :param upstream_branch: An upstream branch to associate with the
             tarball.
+        :param upstream_revision: Upstream revision id
         :param md5sum: hex digest of the md5sum of the tarball, if known.
         :return: (tag_name, revision_id) of the imported tarball.
         """
@@ -1012,7 +1013,8 @@
         try:
             return self.import_upstream(tarball_dir, version, md5sum, parents,
                 upstream_tarball=tarball_filename,
-                upstream_branch=upstream_branch)
+                upstream_branch=upstream_branch,
+                upstream_revision=upstream_revision)
         finally:
             shutil.rmtree(tarball_dir)