Merge lp:~jelmer/bzr-builddeb/merge-6 into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

The attached patch makes exporting the upstream source from a branch
possible when not working in merge mode.

Cheers,

Jelmer

[Robert Collins (lifeless)]

Tests?

review: Needs Fixing

Unmerged revisions

Recent revisions are not available due to the source branch being remote.

=== modified file 'cmds.py'
--- cmds.py	2009-04-15 11:50:06 +0000
+++ cmds.py	2009-04-16 12:23:13 +0000
@@ -304,30 +304,29 @@
             source = True
         return branch, build_options, source
 
-    def _get_upstream_branch(self, merge, export_upstream,
+    def _get_upstream_branch(self, export_upstream,
             export_upstream_revision, config):
         upstream_branch = None
         upstream_revision = None
-        if merge:
-            if export_upstream is None:
-                export_upstream = config.export_upstream
-            if export_upstream:
-                upstream_branch = Branch.open(export_upstream)
-                upstream_branch.lock_read()
-                try:
-                    if export_upstream_revision is None:
-                        export_upstream_revision = \
-                                    config.export_upstream_revision
-                    if export_upstream_revision is None:
-                        upstream_revision = \
-                                upstream_branch.last_revision()
-                    else:
-                        upstream_revspec = RevisionSpec.from_string(
-                                export_upstream_revision)
-                        upstream_revision = \
-                            upstream_revspec.as_revision_id(upstream_branch)
-                finally:
-                    upstream_branch.unlock()
+        if export_upstream is None:
+            export_upstream = config.export_upstream
+        if export_upstream:
+            upstream_branch = Branch.open(export_upstream)
+            upstream_branch.lock_read()
+            try:
+                if export_upstream_revision is None:
+                    export_upstream_revision = \
+                                config.export_upstream_revision
+                if export_upstream_revision is None:
+                    upstream_revision = \
+                            upstream_branch.last_revision()
+                else:
+                    upstream_revspec = RevisionSpec.from_string(
+                            export_upstream_revision)
+                    upstream_revision = \
+                        upstream_revspec.as_revision_id(upstream_branch)
+            finally:
+                upstream_branch.unlock()
         return (upstream_branch, upstream_revision)
 
     def run(self, branch_or_build_options_list=None, verbose=False,
@@ -358,8 +357,9 @@
             result_dir, build_dir, orig_dir = self._get_dirs(config, is_local,
                     result_dir, result, build_dir, orig_dir)
 
+            config.version = changelog.version
             upstream_branch, upstream_revision = \
-                    self._get_upstream_branch(merge, export_upstream,
+                    self._get_upstream_branch(export_upstream,
                             export_upstream_revision, config)
 
             upstream_provider = UpstreamProvider(tree, branch,

=== modified file 'import_dsc.py'
--- import_dsc.py	2009-03-11 07:23:20 +0000
+++ import_dsc.py	2009-04-15 22:04:11 +0000
@@ -548,7 +548,7 @@
             return True
         return False
 
-    def has_upstream_version(self, version, md5=None):
+    def has_upstream_version(self, version, package=None, md5=None):
         """Whether this branch contains the upstream version specified.
 
         The version must be judged present by having the appropriate tag
@@ -563,27 +563,28 @@
         :return: True if the upstream branch contains the specified upstream
             version of the package. False otherwise.
         """
-        tag_name = self.upstream_tag_name(version)
-        if self._has_version(self.upstream_branch, tag_name, md5=md5):
-            return True
-        tag_name = self.upstream_tag_name(version, distro="debian")
-        if self._has_version(self.upstream_branch, tag_name, md5=md5):
-            return True
-        tag_name = self.upstream_tag_name(version, distro="ubuntu")
-        if self._has_version(self.upstream_branch, tag_name, md5=md5):
-            return True
+        for tag_name in self.possible_upstream_tag_names(version, package):
+            if self._has_version(self.upstream_branch, tag_name, md5=md5):
+                return True
         return False
 
-    def has_upstream_version_in_packaging_branch(self, version, md5=None):
-        tag_name = self.upstream_tag_name(version)
-        if self._has_version(self.branch, tag_name, md5=md5):
-            return True
-        tag_name = self.upstream_tag_name(version, distro="debian")
-        if self._has_version(self.branch, tag_name, md5=md5):
-            return True
-        tag_name = self.upstream_tag_name(version, distro="ubuntu")
-        if self._has_version(self.branch, tag_name, md5=md5):
-            return True
+    def possible_upstream_tag_names(self, version, package=None):
+        tags = [self.upstream_tag_name(version),
+                self.upstream_tag_name(version, distro="debian"),
+                self.upstream_tag_name(version, distro="ubuntu")]
+        if package is not None:
+            tags.extend(["%s-%s" % (package, version),
+                         "%s-%s" % (package, version)])
+        tags.extend(["v%s" % version,
+                     "release-%s" % version, 
+                     version])
+        return tags
+
+    def has_upstream_version_in_packaging_branch(self, version, package=None, 
+                                                 md5=None):
+        for tag_name in self.possible_upstream_tag_names(version, package):
+            if self._has_version(self.branch, tag_name, md5=md5):
+                return True
         return False
 
     def contained_versions(self, versions):
@@ -673,7 +674,7 @@
             return self.branch.tags.lookup_tag(ubuntu_tag_name)
         return self.branch.tags.lookup_tag(tag_name)
 
-    def revid_of_upstream_version(self, version):
+    def revid_of_upstream_version(self, version, package=None):
         """Returns the revision id corresponding to the upstream version.
 
         :param version: the Version object to extract the upstream version
@@ -682,15 +683,9 @@
         :return: the revision id corresponding to the upstream portion
             of the version
         """
-        tag_name = self.upstream_tag_name(version)
-        if self._has_version(self.upstream_branch, tag_name):
-            return self.upstream_branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version, distro="debian")
-        if self._has_version(self.upstream_branch, tag_name):
-            return self.upstream_branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version, distro="ubuntu")
-        if self._has_version(self.upstream_branch, tag_name):
-            return self.upstream_branch.tags.lookup_tag(tag_name)
+        for tag_name in self.possible_upstream_tag_names(version, package):
+            if self._has_version(self.upstream_branch, tag_name):
+                return self.upstream_branch.tags.lookup_tag(tag_name)
         tag_name = self.upstream_tag_name(version)
         return self.upstream_branch.tags.lookup_tag(tag_name)
 
@@ -1515,16 +1510,10 @@
             shutil.rmtree(tempdir)
             raise
 
-    def _revid_of_upstream_version_from_branch(self, version):
-        tag_name = self.upstream_tag_name(version)
-        if self._has_version(self.branch, tag_name):
-            return self.branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version, distro="debian")
-        if self._has_version(self.branch, tag_name):
-            return self.branch.tags.lookup_tag(tag_name)
-        tag_name = self.upstream_tag_name(version, distro="ubuntu")
-        if self._has_version(self.branch, tag_name):
-            return self.branch.tags.lookup_tag(tag_name)
+    def _revid_of_upstream_version_from_branch(self, version, package=None):
+        for tag_name in self.possible_upstream_tag_names(version, package):
+            if self._has_version(self.branch, tag_name):
+                return self.branch.tags.lookup_tag(tag_name)
         tag_name = self.upstream_tag_name(version)
         return self.branch.tags.lookup_tag(tag_name)