Mercurial > hg

changeset 29821:8656dcac4ce9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osutil: fix the bug on OS X when we return more in listdir The pointer arithmetic somehow got ommitted during the recent change to use a struct.
author Maciej Fijalkowski <fijall@gmail.com>
date Sat, 20 Aug 2016 23:05:18 +0200
parents e1a4015f5e34
children 61a4cdc98307
files mercurial/pure/osutil.py
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/pure/osutil.py	Sun Aug 21 08:03:22 2016 +0000
+++ b/mercurial/pure/osutil.py	Sat Aug 20 23:05:18 2016 +0200
@@ -120,13 +120,14 @@
                 if skip == name and tp == statmod.S_ISDIR:
                     return []
                 if stat:
-                    mtime = cur.time.tv_sec
+                    mtime = cur.mtime.tv_sec
                     mode = (cur.accessmask & ~lib.S_IFMT)| tp
                     ret.append((name, tp, stat_res(st_mode=mode, st_mtime=mtime,
                                 st_size=cur.datalength)))
                 else:
                     ret.append((name, tp))
-                cur += lgt
+                cur = ffi.cast("val_attrs_t*", int(ffi.cast("intptr_t", cur))
+                    + lgt)
         return ret
 
     def listdir(path, stat=False, skip=None):