Show More
@@ -1690,7 +1690,7 b' class workingfilectx(committablefilectx)' | |||||
1690 | def date(self): |
|
1690 | def date(self): | |
1691 | t, tz = self._changectx.date() |
|
1691 | t, tz = self._changectx.date() | |
1692 | try: |
|
1692 | try: | |
1693 |
return ( |
|
1693 | return (util.statmtimesec(self._repo.wvfs.lstat(self._path)), tz) | |
1694 | except OSError as err: |
|
1694 | except OSError as err: | |
1695 | if err.errno != errno.ENOENT: |
|
1695 | if err.errno != errno.ENOENT: | |
1696 | raise |
|
1696 | raise |
@@ -428,7 +428,7 b' class dirstate(object):' | |||||
428 | def normal(self, f): |
|
428 | def normal(self, f): | |
429 | '''Mark a file normal and clean.''' |
|
429 | '''Mark a file normal and clean.''' | |
430 | s = os.lstat(self._join(f)) |
|
430 | s = os.lstat(self._join(f)) | |
431 |
mtime = |
|
431 | mtime = util.statmtimesec(s) | |
432 | self._addpath(f, 'n', s.st_mode, |
|
432 | self._addpath(f, 'n', s.st_mode, | |
433 | s.st_size & _rangemask, mtime & _rangemask) |
|
433 | s.st_size & _rangemask, mtime & _rangemask) | |
434 | if f in self._copymap: |
|
434 | if f in self._copymap: | |
@@ -998,7 +998,7 b' class dirstate(object):' | |||||
998 | if not st and state in "nma": |
|
998 | if not st and state in "nma": | |
999 | dadd(fn) |
|
999 | dadd(fn) | |
1000 | elif state == 'n': |
|
1000 | elif state == 'n': | |
1001 |
mtime = |
|
1001 | mtime = util.statmtimesec(st) | |
1002 | if (size >= 0 and |
|
1002 | if (size >= 0 and | |
1003 | ((size != st.st_size and size != st.st_size & _rangemask) |
|
1003 | ((size != st.st_size and size != st.st_size & _rangemask) | |
1004 | or ((mode ^ st.st_mode) & 0o100 and checkexec)) |
|
1004 | or ((mode ^ st.st_mode) & 0o100 and checkexec)) |
@@ -952,6 +952,9 b' def fstat(fp):' | |||||
952 | except AttributeError: |
|
952 | except AttributeError: | |
953 | return os.stat(fp.name) |
|
953 | return os.stat(fp.name) | |
954 |
|
954 | |||
|
955 | def statmtimesec(st): | |||
|
956 | return int(st.st_mtime) | |||
|
957 | ||||
955 | # File system features |
|
958 | # File system features | |
956 |
|
959 | |||
957 | def checkcase(path): |
|
960 | def checkcase(path): |
General Comments 0
You need to be logged in to leave comments.
Login now