# HG changeset patch # User Matt Mackall # Date 2016-01-14 18:37:15 # Node ID f6d1e92fdf8c6ad2ce55e1eeb99c88383c891ef6 # Parent 602add6ad9e519598e72c873f7a6581dbbb9e390 mac: ignore resource fork when checking file sizes Some evil evil awful tool adds resource forks to files it's comparing. Our Mac-specific code to do bulk stats was accidentally using "total size" which includes those forks in the file size, causing them to be reported as modified. This changes it to only care about the normal data size and thus agree with what Mercurial's expecting. diff --git a/mercurial/osutil.c b/mercurial/osutil.c --- a/mercurial/osutil.c +++ b/mercurial/osutil.c @@ -458,7 +458,7 @@ static PyObject *_listdir_batch(char *pa requested_attr.bitmapcount = ATTR_BIT_MAP_COUNT; requested_attr.commonattr = (ATTR_CMN_NAME | ATTR_CMN_OBJTYPE | ATTR_CMN_MODTIME | ATTR_CMN_ACCESSMASK); - requested_attr.fileattr = ATTR_FILE_TOTALSIZE; + requested_attr.fileattr = ATTR_FILE_DATALENGTH; *fallback = false;