Mercurial > hg
changeset 27877:f6d1e92fdf8c
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.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 14 Jan 2016 12:37:15 -0600 |
parents | 602add6ad9e5 |
children | e7bd55db011b |
files | mercurial/osutil.c |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/osutil.c Wed Jan 13 10:10:05 2016 -0600 +++ b/mercurial/osutil.c Thu Jan 14 12:37:15 2016 -0600 @@ -458,7 +458,7 @@ 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;