Merge lp:~phanatic/bzr/795557-export-subdir-timestamps into lp:bzr

[Szilveszter Farkas]

Bug #795557, allow exporting a subdir when also exporting the timestamps.

A quick fix for bug 795557 (exporting subdirectories with --per-file-timestamps fails). This is my first patch for Bazaar, so I welcome comments, suggestions.

[Jelmer Vernooij (jelmer)]

Looks great :) Can you add an entry to NEWS (doc/en/release-notes/bzr-2.4.txt) ?

review: Approve

[Vincent Ladeuil (vila)]

Hey phanatic ! Welcome back ;)

Can you execute the contributor agreement http://www.canonical.com/contributors ?

Once that's done and with a news entry added we could land this.

review: Approve

[Szilveszter Farkas (phanatic)]

Thanks for the review, I have also sent the contributor agreement :)

[John A Meinel (jameinel)]

I'll mark this approved, and assume Martin will notice the contributor agreement soon and update the groups.

review: Approve

[John A Meinel (jameinel)]

sent to pqm by email

=== modified file 'bzrlib/export/dir_exporter.py'
--- bzrlib/export/dir_exporter.py	2011-06-06 09:31:59 +0000
+++ bzrlib/export/dir_exporter.py	2011-06-11 20:33:31 +0000
@@ -96,7 +96,11 @@
         if force_mtime is not None:
             mtime = force_mtime
         else:
-            mtime = tree.get_file_mtime(tree.path2id(relpath), relpath)
+            if subdir is None:
+                file_id = tree.path2id(relpath)
+            else:
+                file_id = tree.path2id(osutils.pathjoin(subdir, relpath))
+            mtime = tree.get_file_mtime(file_id, relpath)
         os.utime(fullpath, (mtime, mtime))
 
         yield

=== modified file 'bzrlib/tests/blackbox/test_export.py'
--- bzrlib/tests/blackbox/test_export.py	2011-06-07 13:33:41 +0000
+++ bzrlib/tests/blackbox/test_export.py	2011-06-11 20:33:31 +0000
@@ -387,6 +387,16 @@
         har_st = os.stat('t/har')
         self.assertEquals(315532800, har_st.st_mtime)
 
+    def test_dir_export_partial_tree_per_file_timestamps(self):
+        tree = self.example_branch()
+        self.build_tree(['branch/subdir/', 'branch/subdir/foo.txt'])
+        tree.smart_add(['branch'])
+        # Earliest allowable date on FAT32 filesystems is 1980-01-01
+        tree.commit('setup', timestamp=315532800)
+        self.run_bzr('export --per-file-timestamps tpart branch/subdir')
+        foo_st = os.stat('tpart/foo.txt')
+        self.assertEquals(315532800, foo_st.st_mtime)
+
     def test_export_directory(self):
         """Test --directory option"""
         self.example_branch()

=== modified file 'bzrlib/tests/test_export.py'
--- bzrlib/tests/test_export.py	2011-05-13 12:51:05 +0000
+++ bzrlib/tests/test_export.py	2011-06-11 20:33:31 +0000
@@ -146,6 +146,25 @@
         self.assertEqual(a_time, t.stat('a').st_mtime)
         self.assertEqual(b_time, t.stat('b').st_mtime)
 
+    def test_subdir_files_per_timestamps(self):
+        builder = self.make_branch_builder('source')
+        builder.start_series()
+        foo_time = time.mktime((1999, 12, 12, 0, 0, 0, 0, 0, 0))
+        builder.build_snapshot(None, None, [
+            ('add', ('', 'root-id', 'directory', '')),
+            ('add', ('subdir', 'subdir-id', 'directory', '')),
+            ('add', ('subdir/foo.txt', 'foo-id', 'file', 'content\n'))],
+            timestamp=foo_time)
+        builder.finish_series()
+        b = builder.get_branch()
+        b.lock_read()
+        self.addCleanup(b.unlock)
+        tree = b.basis_tree()
+        export.export(tree, 'target', format='dir', subdir='subdir',
+            per_file_timestamps=True)
+        t = self.get_transport('target')
+        self.assertEquals(foo_time, t.stat('foo.txt').st_mtime)
+
 
 class TarExporterTests(tests.TestCaseWithTransport):
 

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- doc/en/release-notes/bzr-2.4.txt	2011-06-09 11:59:08 +0000
+++ doc/en/release-notes/bzr-2.4.txt	2011-06-11 20:33:31 +0000
@@ -73,6 +73,9 @@
   ``UIFactory.get_password`` and ``UIFactory.get_boolean`` now require a
   unicode prompt to be passed in. (Jelmer Vernooij, #592083)
 
+* Fix exporting subdirectory with ``--per-file-timestamps``.
+  (Szilveszter Farkas, #795557)
+
 Documentation
 *************