Merge lp:~jelmer/bzr-builddeb/import-dsc-incremental into lp:bzr-builddeb

[Jelmer Vernooij]

Fix incremental use of "bzr import-dsc", with tests.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-07-18 20:51:30 +0000
+++ cmds.py	2011-07-19 15:14:11 +0000
@@ -872,15 +872,15 @@
                         '..'))
             try:
                 if last_version is not None:
-                    if not db.pristine_tar_source.has_version(
+                    if not db.pristine_upstream_source.has_version(
                             changelog.package, last_version.upstream_version):
                         raise BzrCommandError("Unable to find the tag for the "
                             "previous upstream version, %s, in the branch: %s."
                             " Consider importing it via import-dsc or "
                             "import-upstream." % (last_version,
-                                    db.pristine_tar_source.tag_name(
+                                    db.pristine_upstream_source.tag_name(
                                         last_version.upstream_version)))
-                    upstream_tip = db.pristine_tar_source.version_as_revision(
+                    upstream_tip = db.pristine_upstream_source.version_as_revision(
                         changelog.package, last_version.upstream_version)
                     db.extract_upstream_tree(upstream_tip, tempdir)
                 else:

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 12:19:45 +0000
+++ debian/changelog	2011-07-19 15:14:11 +0000
@@ -1,3 +1,11 @@
+bzr-builddeb (2.7.6) UNRELEASED; urgency=low
+
+  * Bump standards version to 3.9.2 (no changes).
+  * Fix AttributeError in incremental imports using 'bzr import-dsc'.
+    LP: #812950
+
+ -- Jelmer Vernooij <[e-mail]>  Tue, 19 Jul 2011 17:05:38 +0200
+
 bzr-builddeb (2.7.5) unstable; urgency=low
 
   [ Jelmer Vernooij ]

=== modified file 'debian/control'
--- debian/control	2011-06-13 18:27:03 +0000
+++ debian/control	2011-07-19 15:14:11 +0000
@@ -8,7 +8,7 @@
 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
 X-Python-Version: >= 2.4
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 
 Package: bzr-builddeb
 Architecture: all

=== modified file 'tests/blackbox/test_import_dsc.py'
--- tests/blackbox/test_import_dsc.py	2011-06-04 08:52:53 +0000
+++ tests/blackbox/test_import_dsc.py	2011-07-19 15:14:11 +0000
@@ -25,98 +25,116 @@
 
 from bzrlib.transport import get_transport
 
-from bzrlib.plugins.builddeb.tests import BuilddebTestCase
+from bzrlib.plugins.builddeb.tests import BuilddebTestCase, Version
 from bzrlib.plugins.builddeb.tests.test_import_dsc import PristineTarFeature
 
 
 class TestBaseImportDsc(BuilddebTestCase):
 
-  def _upstream_dir(self, package_name, upstream_version):
-    return package_name + '-' + upstream_version
-  upstream_dir = property(lambda self:self._upstream_dir(self.package_name,
-      self.upstream_version))
-  def _upstream_tarball_name(self, package_name, upstream_version):
-    return package_name + '_' + upstream_version + '.orig.tar.gz'
-  upstream_tarball_name = property(lambda self:
-      self._upstream_tarball_name(self.package_name, self.upstream_version))
-  dsc_name = property(lambda self:
-      self.package_name + '_' + str(self.package_version) + '.dsc')
-
-  def make_unpacked_upstream_source(self, transport=None):
-    if transport is None:
-      transport = get_transport(self.upstream_dir)
-    transport.ensure_base()
-    self.build_tree(['README'], transport=transport)
-
-  def get_test_upstream_version(self, upstream_version):
-    """Return the upstream_version to be used in a test helper method."""
-    if upstream_version is None:
-        return self.upstream_version
-    else:
-        return upstream_version
-
-  def make_upstream_tarball(self, upstream_version=None):
-    upstream_version = self.get_test_upstream_version(upstream_version)
-    upstream_dir = self._upstream_dir(self.package_name, upstream_version)
-    self.make_unpacked_upstream_source(get_transport(upstream_dir))
-    tar = tarfile.open(
-        self._upstream_tarball_name(self.package_name, upstream_version),
-        'w:gz')
-    try:
-      tar.add(self.upstream_dir)
-    finally:
-      tar.close()
-
-  def make_debian_dir(self, debian_dir):
-    os.mkdir(debian_dir)
-    cl = self.make_changelog()
-    self.write_changelog(cl, os.path.join(debian_dir, 'changelog'))
-    f = open(os.path.join(debian_dir, 'control'), 'wb')
-    try:
-      f.write('Source: %s\n' % self.package_name)
-      f.write('Maintainer: none\n')
-      f.write('Standards-Version: 3.7.2\n')
-      f.write('\n')
-      f.write('Package: %s\n' % self.package_name)
-      f.write('Architecture: all\n')
-    finally:
-      f.close()
-
-  def make_real_source_package(self):
-    self.make_upstream_tarball()
-    debian_dir = os.path.join(self.upstream_dir, 'debian')
-    self.make_debian_dir(debian_dir)
-    proc = subprocess.Popen('dpkg-source -b %s' % self.upstream_dir,
+    def _upstream_dir(self, package_name, upstream_version):
+        return package_name + '-' + upstream_version
+
+    upstream_dir = property(lambda self:self._upstream_dir(self.package_name,
+        self.upstream_version))
+
+    def _upstream_tarball_name(self, package_name, upstream_version):
+      return package_name + '_' + upstream_version + '.orig.tar.gz'
+    upstream_tarball_name = property(lambda self:
+        self._upstream_tarball_name(self.package_name, self.upstream_version))
+
+    def make_unpacked_upstream_source(self, transport=None):
+        if transport is None:
+            transport = get_transport(self.upstream_dir)
+        transport.ensure_base()
+        self.build_tree(['README'], transport=transport)
+
+    def make_upstream_tarball(self, upstream_version=None):
+        if upstream_version is None:
+            upstream_version = self.upstream_version
+        upstream_dir = self._upstream_dir(self.package_name, upstream_version)
+        self.make_unpacked_upstream_source(get_transport(upstream_dir))
+        tar = tarfile.open(
+            self._upstream_tarball_name(self.package_name, upstream_version),
+            'w:gz')
+        try:
+            tar.add(upstream_dir)
+        finally:
+            tar.close()
+        return upstream_dir
+
+    def make_debian_dir(self, debian_dir, version=None):
+        os.mkdir(debian_dir)
+        cl = self.make_changelog(version=version)
+        self.write_changelog(cl, os.path.join(debian_dir, 'changelog'))
+        f = open(os.path.join(debian_dir, 'control'), 'wb')
+        try:
+            f.write('Source: %s\n' % self.package_name)
+            f.write('Maintainer: none\n')
+            f.write('Standards-Version: 3.7.2\n')
+            f.write('\n')
+            f.write('Package: %s\n' % self.package_name)
+            f.write('Architecture: all\n')
+        finally:
+            f.close()
+
+    def make_real_source_package(self, version=None):
+        if version is None:
+            version = self.package_version
+        version = Version(version)
+        upstream_version = version.upstream_version
+        upstream_dir = self.make_upstream_tarball(upstream_version)
+        debian_dir = os.path.join(upstream_dir, 'debian')
+        self.make_debian_dir(debian_dir, version=version)
+        proc = subprocess.Popen('dpkg-source -b %s' % upstream_dir,
                             shell=True, stdout=subprocess.PIPE)
-    proc.wait()
-    self.assertEqual(proc.returncode, 0)
-    shutil.rmtree(self.upstream_dir)
+        proc.wait()
+        self.assertEqual(proc.returncode, 0)
+        shutil.rmtree(upstream_dir)
+        dsc_name = "%s_%s.dsc" % (self.package_name, version)
+        return dsc_name
 
 
 class TestImportDsc(TestBaseImportDsc):
 
-  def test_import_dsc(self):
-    self.requireFeature(PristineTarFeature)
-    self.make_real_source_package()
-    tree = self.make_branch_and_tree('.')
-    self.run_bzr('import-dsc %s' % self.dsc_name)
-    tree.lock_read()
-    expected_shape = ['README', 'debian/', 'debian/changelog',
-        'debian/control']
-    try:
-      if getattr(self, "check_tree_shape", None):
-        self.check_tree_shape(tree, expected_shape)
-      else:
-        self.check_inventory_shape(tree.inventory, expected_shape)
-    finally:
-      tree.unlock()
-    self.assertEqual(len(tree.branch.revision_history()), 2)
-
-  def test_import_no_files(self):
-    self.make_branch_and_tree('.')
-    self.make_real_source_package()
-    self.run_bzr_error(['You must give the location of at least one source '
-        'package.'], 'import-dsc')
-
-
-# vim: ts=2 sts=2 sw=2
+    def test_import_dsc_incremental(self):
+        self.requireFeature(PristineTarFeature)
+        tree = self.make_branch_and_tree('.')
+        dsc_name = self.make_real_source_package(version="0.1-1")
+        self.run_bzr('import-dsc %s' % dsc_name)
+        dsc_name = self.make_real_source_package(version="0.2-1")
+        self.run_bzr('import-dsc %s' % dsc_name)
+        tree.lock_read()
+        expected_shape = ['README', 'debian/', 'debian/changelog',
+            'debian/control']
+        try:
+            if getattr(self, "check_tree_shape", None):
+                self.check_tree_shape(tree, expected_shape)
+            else:
+                self.check_inventory_shape(tree.inventory, expected_shape)
+        finally:
+            tree.unlock()
+        self.assertEqual(len(tree.branch.revision_history()), 3)
+
+    def test_import_dsc(self):
+        self.requireFeature(PristineTarFeature)
+        dsc_name = self.make_real_source_package()
+        tree = self.make_branch_and_tree('.')
+        self.run_bzr('import-dsc %s' % dsc_name)
+        tree.lock_read()
+        expected_shape = ['README', 'debian/', 'debian/changelog',
+            'debian/control']
+        try:
+            if getattr(self, "check_tree_shape", None):
+                self.check_tree_shape(tree, expected_shape)
+            else:
+                self.check_inventory_shape(tree.inventory, expected_shape)
+        finally:
+            tree.unlock()
+        self.assertEqual(len(tree.branch.revision_history()), 2)
+
+    def test_import_no_files(self):
+        self.make_branch_and_tree('.')
+        self.make_real_source_package()
+        self.run_bzr_error(
+            ['You must give the location of at least one source package.'],
+            'import-dsc')