Merge lp:~lifeless/bzr/bug-515631 into lp:bzr

[Robert Collins]

[Robert Collins (lifeless)]

* Set the mtime of files exported to a directory by ``bzr export`` all to
  the same value to avoid confusing ``make`` and other date-based build
  systems. (Robert Collins, #515631)

This bug affects 'bzr builddeb'

[James Westby (james-w)]

Looks good to me, please land.

Thanks,

James

review: Approve

[Robert Collins (lifeless)]

On Tue, 2010-02-02 at 00:33 +0000, James Westby wrote:
> Review: Approve
> Looks good to me, please land.

Its landed.... we may want to ship a patch in the Debian 2.1 package
with this, for packagers.

-Rob

[Martin Pool (mbp)]

I think this would be reasonable to land directly to 2.1.1:

* it's a bug (at least arguably)
* the change is quite small

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> I think this would be reasonable to land directly to 2.1.1:
>
> * it's a bug (at least arguably)
> * the change is quite small

Well, 2.1.0 is scheduled for Thurs, and we already have 1 or 2 bugfixes
pending in that branch....

I certainly agree that this can go into the stable 2.1 series. (Arguably
we could even get it into the 2.0 series...)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktoYKQACgkQJdeBCYSNAAMfigCfbN7pX6XxcbNYcGZxlNncA8n1
ahcAmQFajg7523LIbGs9m84yV0xZNPn8
=j5TX
-----END PGP SIGNATURE-----

=== modified file 'NEWS'
--- NEWS	2010-02-01 11:40:56 +0000
+++ NEWS	2010-02-01 22:30:26 +0000
@@ -25,6 +25,10 @@
 * Fix "AttributeError in Inter1and2Helper" during fetch.
   (Martin Pool, #513432)
 
+* Set the mtime of files exported to a directory by ``bzr export`` all to
+  the same value to avoid confusing ``make`` and other date-based build
+  systems. (Robert Collins, #515631)
+
 Improvements
 ************
 

=== modified file 'bzrlib/export/dir_exporter.py'
--- bzrlib/export/dir_exporter.py	2009-12-18 05:38:40 +0000
+++ bzrlib/export/dir_exporter.py	2010-02-01 22:30:26 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2009 Canonical Ltd
+# Copyright (C) 2005, 2009-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,12 +14,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-"""Export a Tree to a non-versioned directory.
-"""
+"""Export a bzrlib.tree.Tree to a new or empty directory."""
 
 import errno
 import os
 import StringIO
+import time
 
 from bzrlib import errors, osutils
 from bzrlib.export import _export_iter_entries
@@ -33,14 +33,11 @@
 def dir_exporter(tree, dest, root, subdir, filtered=False):
     """Export this tree to a new directory.
 
-    `dest` should not exist, and will be created holding the
-    contents of this tree.
-
-    TODO: To handle subdirectories we need to create the
-           directories first.
+    `dest` should either not exist or should be empty. If it does not exist it
+    will be created holding the contents of this tree.
 
     :note: If the export fails, the destination directory will be
-           left in a half-assed state.
+           left in an incompletely exported state: export is not transactional.
     """
     mutter('export version %r', tree)
     try:
@@ -79,6 +76,7 @@
     # The data returned here can be in any order, but we've already created all
     # the directories
     flags = os.O_CREAT | os.O_TRUNC | os.O_WRONLY | getattr(os, 'O_BINARY', 0)
+    now = time.time()
     for (relpath, executable), chunks in tree.iter_files_bytes(to_fetch):
         if filtered:
             filters = tree._content_filter_stack(relpath)
@@ -94,3 +92,4 @@
             out.writelines(chunks)
         finally:
             out.close()
+        os.utime(fullpath, (now, now))

=== modified file 'bzrlib/tests/test_export.py'
--- bzrlib/tests/test_export.py	2009-07-29 13:46:55 +0000
+++ bzrlib/tests/test_export.py	2010-02-01 22:30:26 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009-2010 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 import os
-
+import time
 
 from bzrlib import (
     errors,
@@ -62,3 +62,30 @@
         wt.commit('1')
         self.build_tree(['target/', 'target/foo'])
         self.assertRaises(errors.BzrError, export.export, wt, 'target', format="dir")
+
+    def test_dir_export_files_same_timestamp(self):
+        builder = self.make_branch_builder('source')
+        builder.start_series()
+        builder.build_snapshot(None, None, [
+            ('add', ('', 'root-id', 'directory', '')),
+            ('add', ('a', 'a-id', 'file', 'content\n'))])
+        builder.build_snapshot(None, None, [
+            ('add', ('b', 'b-id', 'file', 'content\n'))])
+        builder.finish_series()
+        b = builder.get_branch()
+        b.lock_read()
+        self.addCleanup(b.unlock)
+        tree = b.basis_tree()
+        orig_iter_files_bytes = tree.iter_files_bytes
+        # Make iter_files_bytes slower, so we provoke mtime skew
+        def iter_files_bytes(to_fetch):
+            for thing in orig_iter_files_bytes(to_fetch):
+                yield thing
+                time.sleep(1)
+        tree.iter_files_bytes = iter_files_bytes
+        export.export(tree, 'target', format='dir')
+        t = self.get_transport('target')
+        st_a = t.stat('a')
+        st_b = t.stat('b')
+        # All files must be given the same mtime.
+        self.assertEqual(st_a.st_mtime, st_b.st_mtime)