Merge lp:~jelmer/bzr-builddeb/inline-get-upstream-sources into lp:bzr-builddeb

[Jelmer Vernooij]

This inlines get_upstream_sources, the current indirection is unnecessary imho and makes it harder to see what's actually used to find the upstream sources for a certain situation.

=== modified file 'cmds.py'
--- cmds.py	2010-05-06 14:30:28 +0000
+++ cmds.py	2010-05-24 02:04:25 +0000
@@ -76,9 +76,13 @@
         upstream_tag_version,
         )
 from bzrlib.plugins.builddeb.upstream import (
+        AptSource,
+        GetOrigSourceSource,
+        PristineTarSource,
+        SelfSplitSource,
+        UScanSource,
         UpstreamProvider,
         UpstreamBranchSource,
-        get_upstream_sources,
         )
 from bzrlib.plugins.builddeb.util import (
         debuild_config,
@@ -364,17 +368,28 @@
             result_dir, build_dir, orig_dir = self._get_dirs(config, branch,
                     is_local, result_dir or result, build_dir, orig_dir)
 
-            upstream_branch, upstream_revision = \
-                    self._get_upstream_branch(merge, export_upstream,
-                            export_upstream_revision, config,
-                            changelog.version)
-            upstream_provider = UpstreamProvider(
-                    changelog.package, changelog.version,
-                    orig_dir, get_upstream_sources(tree, branch,
-                    larstiq=larstiq, upstream_branch=upstream_branch,
-                    upstream_revision_map={
-                        changelog.version.upstream_version:upstream_revision
-                    }, allow_split=split))
+            upstream_sources = [
+                PristineTarSource(tree, branch), 
+                AptSource(),
+                ]
+            if merge:
+                upstream_branch, upstream_revision = self._get_upstream_branch(
+                    merge, export_upstream, export_upstream_revision, config,
+                    changelog.version)
+                upstream_sources.append(UpstreamBranchSource(upstream_branch,
+                    {changelog.version.upstream_version: upstream_revision}))
+            elif not native and config.upstream_branch:
+                upstream_branch = Branch.open(config.upstream_branch)
+                upstream_sources.append(UpstreamBranchSource(upstream_branch))
+            upstream_sources.extend([
+                GetOrigSourceSource(tree, larstiq), 
+                UScanSource(tree, larstiq),
+                ])
+            if split:
+                upstream_sources.append(SelfSplitSource(tree))
+ 
+            upstream_provider = UpstreamProvider(changelog.package,
+                changelog.version, orig_dir, upstream_sources)
 
             if merge:
                 distiller_cls = MergeModeDistiller
@@ -873,9 +888,13 @@
         orig_dir = config.orig_dir
         if orig_dir is None:
             orig_dir = default_orig_dir
+
         upstream_provider = UpstreamProvider(changelog.package, 
                 changelog.version.upstream_version, orig_dir, 
-                get_upstream_sources(t, t.branch, larstiq=larstiq))
+                [PristineTarSource(t, t.branch),
+                 AptSource(),
+                 GetOrigSourceSource(t, larstiq),
+                 UScanSource(t, larstiq) ])
 
         distiller = MergeModeDistiller(t, upstream_provider,
                 larstiq=larstiq)

=== modified file 'upstream.py'
--- upstream.py	2010-04-22 10:54:52 +0000
+++ upstream.py	2010-05-24 02:04:25 +0000
@@ -153,21 +153,17 @@
     :ivar upstream_version_map: Map from version strings to revids
     """
 
-    def __init__(self, upstream_branch, upstream_revision_map=None, 
-                 fallback_revspec=None):
+    def __init__(self, upstream_branch, upstream_revision_map=None):
         self.upstream_branch = upstream_branch
         if upstream_revision_map is None:
             self.upstream_revision_map = {}
         else:
             self.upstream_revision_map = upstream_revision_map
-        self.fallback_revspec = fallback_revspec
 
     def _get_revision_id(self, version):
         if version in self.upstream_revision_map:
              return self.upstream_revision_map[version]
         revspec = get_snapshot_revision(version)
-        if revspec is None:
-            revspec = self.fallback_revspec
         if revspec is not None:
             return RevisionSpec.from_string(
                 revspec).as_revision_id(self.upstream_branch)
@@ -352,37 +348,6 @@
         return None
 
 
-def get_upstream_sources(tree, branch, larstiq=False, upstream_branch=None,
-                         upstream_revision_map=None, allow_split=False):
-    """Get the list of upstream sources to retrieve upstream versions from.
-
-    :param tree: The tree that is being built from.
-    :param branch: The branch that is being built from.
-    :param larstiq: Whether the tree versions the root of ./debian.
-    :param upstream_branch: An upstream branch that can be exported
-        if needed.
-    :param upstream_revision_map: Map mapping upstream version strings
-        to revision ids.
-    :param allow_split: Whether the provider can provide the tarball
-        by exporting the branch and removing the "debian" dir.
-
-    """
-    sources = [
-        PristineTarSource(tree, branch), 
-        AptSource(),
-        ]
-    if upstream_branch is not None:
-        sources.append(
-            UpstreamBranchSource(upstream_branch, upstream_revision_map))
-    sources.extend([
-        GetOrigSourceSource(tree, larstiq), 
-        UScanSource(tree, larstiq),
-        ])
-    if allow_split:
-        sources.append(SelfSplitSource(tree))
-    return sources
-
-
 class UpstreamProvider(object):
     """An upstream provider can provide the upstream source for a package.