Merge lp:~jelmer/brz-debian/read-metadata into lp:brz-debian

[Jelmer Vernooij]

Read debian/upstream/metadata for upstream branch.

[lp:~jelmer/brz-debian/read-metadata]

803. By Jelmer Vernooij on 2018-09-08

Add test.

=== modified file 'cmds.py'
--- cmds.py	2018-06-14 19:55:05 +0000
+++ cmds.py	2018-09-08 23:10:53 +0000
@@ -739,6 +739,7 @@
                 except NotBranchError:
                     upstream_branch = None
             elif upstream_branch is None and config.upstream_branch is not None:
+                note(gettext("Using upstream branch %s (from configuration)") % config.upstream_branch)
                 upstream_branch = Branch.open(config.upstream_branch)
             else:
                 upstream_branch = None

=== modified file 'config.py'
--- config.py	2018-06-14 19:55:05 +0000
+++ config.py	2018-09-08 23:10:53 +0000
@@ -20,11 +20,14 @@
 
 from __future__ import absolute_import
 
+import yaml
+
 from ...config import (
   configobj,
   ConfigObj,
   TreeConfig,
   )
+from ...errors import NoSuchFile
 from ...trace import mutter, warning
 
 
@@ -55,6 +58,28 @@
     return None
 
 
+class UpstreamMetadataConfig(object):
+  """Config object that represents debian/upstream/metadata.
+  """
+
+  filename = 'debian/upstream/metadata'
+
+  def __init__(self, text):
+    self.metadata = yaml.safe_load(text)
+
+  def get_value(self, section, option):
+    if section == "BUILDDEB":
+      if option == "upstream-branch":
+        return self.metadata.get('Repository')
+    raise KeyError
+
+  def get_bool(self, section, option):
+    raise KeyError
+
+  def as_bool(self, option):
+    raise KeyError
+
+
 class DebBuildConfig(object):
   """Holds the configuration settings for builddeb. These are taken from
   a hierarchy of config files. .bzr-builddeb/local.conf then 
@@ -129,6 +154,12 @@
           pass # Not a svn tree
       except ImportError:
         pass # No svn, apparently
+      try:
+        upstream_metadata_text = tree.get_file_text(UpstreamMetadataConfig.filename)
+      except NoSuchFile:
+        pass
+      else:
+        self._config_files.append((UpstreamMetadataConfig(upstream_metadata_text), False))
     self.user_config = None
 
   def set_user_config(self, user_conf):

=== modified file 'debian/changelog'
--- debian/changelog	2018-05-19 14:32:42 +0000
+++ debian/changelog	2018-09-08 23:10:53 +0000
@@ -2,6 +2,7 @@
 
   * Update Vcs-Bzr to reflect code hosting is now on code.breezy-
     vcs.org.
+  * Read upstream branch from debian/upstream/metadata. LP: #1791456
 
  -- Jelmer Vernooij <[e-mail]>  Sat, 19 May 2018 15:32:40 +0100
 

=== modified file 'debian/control'
--- debian/control	2018-05-19 14:32:42 +0000
+++ debian/control	2018-09-08 23:10:53 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Bazaar Maintainers <[e-mail]>
 Uploaders: Jelmer Vernooij <[e-mail]>
 Build-Depends: debhelper (>= 9), python-all (>= 2.6.6-3), xz-utils
-Build-Depends-Indep: brz, python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts (>= 2.10.59), python-subunit, python-breezy.tests (>= 3.0.0~bzr6876), python-lzma, libalgorithm-merge-perl, python-distro-info, quilt, python-dulwich (>= 0.19)
+Build-Depends-Indep: brz, python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar, devscripts (>= 2.10.59), python-subunit, python-breezy.tests (>= 3.0.0~bzr6876), python-lzma, libalgorithm-merge-perl, python-distro-info, quilt, python-dulwich (>= 0.19), python-yaml
 Vcs-Bzr: https://code.breezy-vcs.org/breezy-debian/unstable
 Vcs-Browser: https://code.breezy-vcs.org/breezy-debian/unstable
 X-Python-Version: >= 2.4
@@ -13,7 +13,7 @@
 
 Package: brz-debian
 Architecture: all
-Depends: brz (>= 3.0.0~bzr6876), python-breezy (>= 3.0.0~bzr6876), python-debian (>= 0.1.11), python-apt, ${python:Depends}, dpkg-dev, fakeroot, devscripts (>= 2.10.59), patchutils, pristine-tar, quilt, ${misc:Depends}
+Depends: brz (>= 3.0.0~bzr6876), python-breezy (>= 3.0.0~bzr6876), python-debian (>= 0.1.11), python-apt, ${python:Depends}, dpkg-dev, fakeroot, devscripts (>= 2.10.59), patchutils, pristine-tar, quilt, ${misc:Depends}, python-yaml
 Recommends: python-launchpadlib, libalgorithm-merge-perl, python-distro-info
 Suggests: python-lzma
 Provides: brz-buildpackage

=== modified file 'tests/test_config.py'
--- tests/test_config.py	2017-06-17 12:44:22 +0000
+++ tests/test_config.py	2018-09-08 23:10:53 +0000
@@ -91,6 +91,23 @@
       f.close()
     DebBuildConfig([('invalid.conf', True, 'invalid.conf')])
 
+  def test_upstream_metadata(self):
+    cfg = DebBuildConfig([], tree=self.branch.basis_tree())
+    self.assertIs(None, cfg.upstream_branch)
+
+    self.build_tree_contents([
+      ('debian/',),
+      ('debian/upstream/',),
+      ('debian/upstream/metadata',
+        b'Name: example\n'
+        b'Repository: http://example.com/foo\n'
+        )])
+    self.tree.add(['debian', 'debian/upstream', 'debian/upstream/metadata'])
+
+    cfg = DebBuildConfig([], tree=self.tree)
+    self.assertEquals("http://example.com/foo", cfg.upstream_branch)
+
+
 try:
   from ...svn.config import SubversionBuildPackageConfig
 except ImportError:
@@ -137,4 +154,5 @@
       cfg = DebBuildConfig([], tree=branch.basis_tree())
       self.assertEquals("someorigdir", cfg.orig_dir)
 
+
 # vim: ts=2 sts=2 sw=2