Merge lp:~gz/bzr/kindness_to_FAT_and_other_utime_stories_epilogue into lp:bzr

[Martin Packman]

When writing temporary files for external diff do not set the file utime if we don't know when the in-tree file was last modified.

As per the discussion in the prerequisite branch, this change stops the diff code trying to set the date of files with undetermined timestamps to start of the unix epoch.

As I didn't actually get a failure from this, I presume there's no test coverage for this path, it may not even be reachable. However, there seems to be some agreement that not setting the mtime if there's no timestamp is the right option.

[John A Meinel (jameinel)]

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

Martin [gz] wrote:
> Martin [gz] has proposed merging lp:~gz/bzr/kindness_to_FAT_and_other_utime_stories_epilogue into lp:bzr with lp:~gz/bzr/kindness_to_FAT_and_other_utime_stories as a prerequisite.
>
> Requested reviews:
> bzr-core (bzr-core)
>
>
> As per the discussion in the prerequisite branch, this change stops the diff code trying to set the date of files with undetermined timestamps to start of the unix epoch.
>
> As I didn't actually get a failure from this, I presume there's no test coverage for this path, it may not even be reachable. However, there seems to be some agreement that not setting the mtime if there's no timestamp is the right option.
>

I think is is reasonable.

John
=:->

  review: approve

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

iEYEARECAAYFAkvIlR8ACgkQJdeBCYSNAAOmhgCeJMRCFMQuyE2pLhmwSDRI0Yj0
4GsAoKLAL+eu1mewn9MwRVVO7fQUkT/W
=2uaX
-----END PGP SIGNATURE-----

review: Approve

[bzr PQM (bzr-pqm)]

Exception processing merge: 'NoneType' object is not iterable

=== modified file 'bzrlib/diff.py'
--- bzrlib/diff.py	2010-04-16 13:23:21 +0000
+++ bzrlib/diff.py	2010-04-16 13:23:23 +0000
@@ -801,10 +801,9 @@
         try:
             mtime = tree.get_file_mtime(file_id)
         except errors.FileTimestampUnavailable:
-            # GZ 2010-04-13: Zero is a bad 'unavailable' time as it predates
-            #                the earliest allowable date on FAT filesystems
-            mtime = 0
-        os.utime(full_path, (mtime, mtime))
+            pass
+        else:
+            os.utime(full_path, (mtime, mtime))
         if not allow_write:
             osutils.make_readonly(full_path)
         return full_path