Rev 449: Stop stripping .bzrignore from tarball imports. LP: #496907 in http://people.canonical.com/~robertc/baz2.0/plugins/builddeb/trunk

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/plugins/builddeb/trunk

------------------------------------------------------------
revno: 449
revision-id: robertc at robertcollins.net-20100505030211-57p7lddw4cbrymme
parent: james.westby at canonical.com-20100504112746-c5y3sva77kydb0z5
fixes bug(s): https://launchpad.net/bugs/496907
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Wed 2010-05-05 15:02:11 +1200
message:
  Stop stripping .bzrignore from tarball imports. LP: #496907
=== modified file 'bzrtools_import.py'
--- a/bzrtools_import.py	2010-02-04 23:41:39 +0000
+++ b/bzrtools_import.py	2010-05-05 03:02:11 +0000
@@ -63,7 +63,7 @@
 
 
 files_to_ignore = set(
-    ['.bzrignore', '.shelf', '.bzr', '.bzr.backup', '.bzrtags',
+    ['.shelf', '.bzr', '.bzr.backup', '.bzrtags',
      '.bzr-builddeb'])
 
 

=== modified file 'debian/changelog'
--- a/debian/changelog	2010-05-03 03:03:34 +0000
+++ b/debian/changelog	2010-05-05 03:02:11 +0000
@@ -17,6 +17,7 @@
   [ Robert Collins ]
   * Add import-upstream command which imports an upstream - useful for
     migrating existing packaging branches into pristine-tar using mode.
+  * Stop stripping .bzrignore from tarball imports. LP: #496907
 
  -- Jelmer Vernooij <jelmer at debian.org>  Thu, 15 Apr 2010 19:28:25 +0200
 

=== modified file 'tests/test_import_dsc.py'
--- a/tests/test_import_dsc.py	2010-04-10 01:44:18 +0000
+++ b/tests/test_import_dsc.py	2010-05-05 03:02:11 +0000
@@ -746,15 +746,28 @@
         check_one_type("modified", modified, changes.modified)
         check_one_type("renamed", renamed, changes.renamed)
 
+    def import_a_tree(self, contents=None):
+        """Import a tree from disk."""
+        version = Version("0.1-1")
+        name = "package"
+        basedir = name + "-" + str(version.upstream_version)
+        if contents is None:
+            contents = [
+                (basedir + '/',),
+                (os.path.join(basedir, "README"), "Hi\n"),
+                (os.path.join(basedir, "BUGS"), ""),
+                ]
+        else:
+            # add basedir to the contents
+            contents = [(basedir + '/' + element[0],) + element[1:] for
+                element in contents]
+        self.build_tree_contents(contents)
+        self.db1.import_upstream(basedir, version.upstream_version, 
+            self.fake_md5_1, [])
+        return version
+
     def test_import_upstream(self):
-        version = Version("0.1-1")
-        name = "package"
-        basedir = name + "-" + str(version.upstream_version)
-        os.mkdir(basedir)
-        write_to_file(os.path.join(basedir, "README"), "Hi\n")
-        write_to_file(os.path.join(basedir, "BUGS"), "")
-        self.db1.import_upstream(basedir, version.upstream_version, 
-            self.fake_md5_1, [])
+        version = self.import_a_tree()
         tree = self.up_tree1
         branch = tree.branch
         rh = branch.revision_history()
@@ -766,6 +779,15 @@
                 "Import upstream version %s" % str(version.upstream_version))
         self.assertEqual(rev.properties['deb-md5'], self.fake_md5_1)
 
+    def test_import_upstream_preserves_dot_bzrignore(self):
+        self.import_a_tree([('',), ('.bzrignore', '')])
+        branch = self.up_tree1.branch
+        branch.lock_read()
+        self.addCleanup(branch.unlock)
+        tip = branch.last_revision()
+        revtree = branch.repository.revision_tree(tip)
+        self.assertNotEqual(None, revtree.path2id('.bzrignore'))
+
     def test_import_upstream_on_another(self):
         version1 = Version("0.1-1")
         version2 = Version("0.2-1")