Mercurial > hg > mercurial-source
changeset 33529:77f354ae1123
util: make filestat.avoidambig() return whether ambiguity is avoided or not
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Fri, 09 Jun 2017 12:58:17 +0900 |
parents | 23734c0e361f |
children | 1a79de471d56 |
files | mercurial/util.py |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/util.py +++ b/mercurial/util.py @@ -1568,7 +1568,10 @@ 'old' should be previous filestat of 'path'. This skips avoiding ambiguity, if a process doesn't have - appropriate privileges for 'path'. + appropriate privileges for 'path'. This returns False in this + case. + + Otherwise, this returns True, as "ambiguity is avoided". """ advanced = (old.stat.st_mtime + 1) & 0x7fffffff try: @@ -1577,8 +1580,9 @@ if inst.errno == errno.EPERM: # utime() on the file created by another user causes EPERM, # if a process doesn't have appropriate privileges - return + return False raise + return True def __ne__(self, other): return not self == other