Merge lp:~gz/bzr-git/import_os_not_posix_841177 into lp:bzr-git

[Martin Packman]

Makes bzr-git stick to the `os` module, which is a platform independent wrapper for the builtin `posix`, `nt` and so on modules. There is no behaviour change here, apart from making the module importable on non-posix systems.

I resisted changing `posixpath` usage into `os.path` because it's not trivial to tell which is actually desired. Paths from the filesystem should be operated on with `os.path` but normalized bzrlib paths that use forward slashes only can use most of the posixpath functions safely.

[Martin Packman (gz)]

To answer a query from IRC, stat_result doesn't have different content or behaviour in the cases here. See statresult_new in Modules/posixmodules.c which is pretty straight forward. (The module source confusingly has 'posix' in the name but is cross-platform code, and results in a module named after the platform).

The conflicts with trunk are a little crazy, but should be easy enough to resolve correctly now.

=== modified file 'workingtree.py'
--- workingtree.py	2011-09-04 18:33:18 +0000
+++ workingtree.py	2011-09-04 18:42:40 +0000
@@ -34,7 +34,11 @@
     ZERO_SHA,
     )
 import os
+<<<<<<< TREE
 from posix import stat_result
+=======
+# GZ 2011-09-04: Should use os.path instead unless certain of posix format.
+>>>>>>> MERGE-SOURCE
 import posixpath
 import stat
 import sys
@@ -131,7 +135,12 @@
             except (errors.NoSuchFile, IOError):
                 # TODO: Rather than come up with something here, use the old index
                 file = StringIO()
+<<<<<<< TREE
                 stat_val = stat_result((stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+=======
+                stat_val = os.stat_result(
+                    (stat.S_IFREG | 0644, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+>>>>>>> MERGE-SOURCE
             blob.set_raw_string(file.read())
         elif kind == "symlink":
             blob = Blob()
@@ -140,7 +149,12 @@
             except (errors.NoSuchFile, OSError):
                 # TODO: Rather than come up with something here, use the 
                 # old index
+<<<<<<< TREE
                 stat_val = stat_result((stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+=======
+                stat_val = os.stat_result(
+                    (stat.S_IFLNK, 0, 0, 0, 0, 0, 0, 0, 0, 0))
+>>>>>>> MERGE-SOURCE
             blob.set_raw_string(
                 self.get_symlink_target(file_id, path).encode("utf-8"))
         else:
@@ -695,7 +709,11 @@
             dir_file_id = self.path2id(dirname)
             assert isinstance(value, tuple) and len(value) == 10
             (ctime, mtime, dev, ino, mode, uid, gid, size, sha, flags) = value
+<<<<<<< TREE
             stat_result = stat_result((mode, ino,
+=======
+            stat_result = os.stat_result((mode, ino,
+>>>>>>> MERGE-SOURCE
                     dev, 1, uid, gid, size,
                     0, mtime, ctime))
             per_dir[(dirname, dir_file_id)].append(