Merge lp:~jelmer/bzr-builddeb/deprecate-export-upstream into lp:bzr-builddeb

[Jelmer Vernooij]

Deprecate the 'export-upstream' configuration option in favour of 'upstream-branch'.

Fix the --export-upstream-revision argument for "bzr builddeb".

[lp:~jelmer/bzr-builddeb/deprecate-export-upstream]

539. By Jelmer Vernooij on 2011-03-06

Add bug #

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-02-27 16:15:50 +0000
+++ cmds.py	2011-03-06 21:35:09 +0000
@@ -2,7 +2,7 @@
 #    Copyright (C) 2005 Jamie Wilkinson <[e-mail]> 
 #                  2006, 2007 James Westby <[e-mail]>
 #                  2007 Reinhard Tartler <[e-mail]>
-#                  2008 Canonical Ltd.
+#                  2008-2011 Canonical Ltd.
 #
 #    This file is part of bzr-builddeb.
 #
@@ -47,6 +47,7 @@
     NoWorkingTree,
     )
 from bzrlib.option import Option
+from bzrlib.revisionspec import RevisionSpec
 from bzrlib.tag import _merge_tags_if_possible
 from bzrlib.trace import note, warning
 from bzrlib.workingtree import WorkingTree
@@ -63,7 +64,6 @@
 from bzrlib.plugins.builddeb.config import (
     BUILD_TYPE_MERGE,
     BUILD_TYPE_NATIVE,
-    BUILD_TYPE_NORMAL,
     BUILD_TYPE_SPLIT,
     )
 from bzrlib.plugins.builddeb.errors import (
@@ -306,27 +306,19 @@
             source = True
         return branch, build_options, source
 
-    def _get_upstream_branch(self, build_type, export_upstream,
-            export_upstream_revision, config, version):
-        upstream_branch = None
-        upstream_revision = None
-        if build_type == BUILD_TYPE_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:
-                    upstream_source = UpstreamBranchSource(upstream_branch,
-                        config=config)
-                    if version is None:
-                        upstream_revision = upstream_branch.last_revision()
-                    else:
-                        upstream_revision = upstream_source.version_as_revision(
-                            None, version.upstream_version.encode("utf-8"))
-                finally:
-                    upstream_branch.unlock()
-        return (upstream_branch, upstream_revision)
+    def _get_upstream_branch(self, export_upstream, export_upstream_revision,
+            config, version):
+        upstream_branch = Branch.open(export_upstream)
+        upstream_branch.lock_read()
+        try:
+            upstream_source = UpstreamBranchSource(upstream_branch, config=config)
+            if export_upstream_revision:
+                revspec = RevisionSpec.from_string(export_upstream_revision)
+                revid = revspec.as_revision_id(upstream_branch)
+                upstream_source.upstream_revision_map[version.encode("utf-8")] = revid
+        finally:
+            upstream_branch.unlock()
+        return upstream_source
 
     def run(self, branch_or_build_options_list=None, verbose=False,
             working_tree=False,
@@ -390,14 +382,17 @@
                 AptSource(),
                 ]
             if build_type == BUILD_TYPE_MERGE:
-                upstream_branch, upstream_revision = self._get_upstream_branch(
-                    build_type, export_upstream, export_upstream_revision, config,
-                    changelog.version)
-                if upstream_branch is not None:
-                    upstream_sources.append(UpstreamBranchSource(
-                            upstream_branch,
-                            {changelog.version.upstream_version:
-                            upstream_revision}))
+                if export_upstream is None and config.export_upstream:
+                    export_upstream = config.export_upstream
+                    warning("The 'export-upstream' configuration option is deprecated. "
+                            "Use 'upstream-branch' instead.")
+                if export_upstream is None and config.upstream_branch:
+                    export_upstream = config.upstream_branch
+                if export_upstream:
+                    upstream_branch_source = self._get_upstream_branch(
+                        export_upstream, export_upstream_revision, config,
+                        changelog.version.upstream_version)
+                    upstream_sources.append(upstream_branch_source)
             elif not native and config.upstream_branch is not None:
                 upstream_branch = Branch.open(config.upstream_branch)
                 upstream_sources.append(UpstreamBranchSource(upstream_branch))

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-01 12:17:01 +0000
+++ debian/changelog	2011-03-06 21:35:09 +0000
@@ -44,7 +44,11 @@
 
   * Add devscripts to Build-Depends-Indep, the test suite runs dch.
 
- -- Jelmer Vernooij <[e-mail]>  Sun, 27 Feb 2011 03:08:09 +0100
+  [ Jelmer Vernooij ]
+  * The 'export-upstream' configuration option is now deprecated in
+    favour of 'upstream-branch'. LP: #730293
+
+ -- Jelmer Vernooij <[e-mail]>  Fri, 04 Mar 2011 19:30:01 +0100
 
 bzr-builddeb (2.6) unstable; urgency=low
 

=== modified file 'doc/user_manual/configuration.rst'
--- doc/user_manual/configuration.rst	2009-03-02 22:06:20 +0000
+++ doc/user_manual/configuration.rst	2011-03-06 21:35:09 +0000
@@ -95,10 +95,10 @@
 
 When the upstream source is in ``bazaar`` it is possible to have the
 ``.orig.tar.gz`` created by exporting the upstream branch. To do this set
-the ``export-upstream`` option. This only works only for merge mode. For
+the ``upstream-branch`` option. This only works only for merge mode. For
 normal mode use the ``merge-upstream`` command.
 
-  * ``export-upstream = path``
+  * ``upstream-branch = path``
 
     This option takes a path (remote or local) to a bzr branch that contains
     the upstream code. If this is set then the plugin will export the code
@@ -110,7 +110,7 @@
     This sets the revision that the upstream code will be branched at. It takes
     the same revision spec as the normal --revision parameter. Use it to
     associate an upstream version number with a particular revision of the
-    upstream code. This has no effect if ``export-upstream`` is not set.
+    upstream code. This has no effect if ``upstream-branch`` is not set.
 
 
 Builders

=== modified file 'upstream/branch.py'
--- upstream/branch.py	2011-02-21 16:49:06 +0000
+++ upstream/branch.py	2011-03-06 21:35:09 +0000
@@ -228,8 +228,7 @@
         assert isinstance(version, str)
         if version in self.upstream_revision_map:
              return self.upstream_revision_map[version]
-        revspec = get_export_upstream_revision(self.config,
-            version=version)
+        revspec = get_export_upstream_revision(self.config, version=version)
         if revspec is not None:
             return RevisionSpec.from_string(
                 revspec).as_revision_id(self.upstream_branch)