Show More
@@ -261,12 +261,9 b' def lfdirstatestatus(lfdirstate, repo):' | |||||
261 | st = wctx[lfile].lstat() |
|
261 | st = wctx[lfile].lstat() | |
262 | mode = st.st_mode |
|
262 | mode = st.st_mode | |
263 | size = st.st_size |
|
263 | size = st.st_size | |
264 | mtime = timestamp.mtime_of(st) |
|
264 | mtime = timestamp.reliable_mtime_of(st, mtime_boundary) | |
|
265 | if mtime is not None: | |||
265 | cache_data = (mode, size, mtime) |
|
266 | cache_data = (mode, size, mtime) | |
266 | # We should consider using the mtime_boundary |
|
|||
267 | # logic here, but largefile never actually had |
|
|||
268 | # ambiguity protection before, so this confuse |
|
|||
269 | # the tests and need more thinking. |
|
|||
270 | lfdirstate.set_clean(lfile, cache_data) |
|
267 | lfdirstate.set_clean(lfile, cache_data) | |
271 | return s |
|
268 | return s | |
272 |
|
269 |
@@ -228,12 +228,11 b' def reposetup(ui, repo):' | |||||
228 | s = wctx[lfile].lstat() |
|
228 | s = wctx[lfile].lstat() | |
229 | mode = s.st_mode |
|
229 | mode = s.st_mode | |
230 | size = s.st_size |
|
230 | size = s.st_size | |
231 |
mtime = timestamp.mtime_of( |
|
231 | mtime = timestamp.reliable_mtime_of( | |
|
232 | s, mtime_boundary | |||
|
233 | ) | |||
|
234 | if mtime is not None: | |||
232 | cache_data = (mode, size, mtime) |
|
235 | cache_data = (mode, size, mtime) | |
233 | # We should consider using the mtime_boundary |
|
|||
234 | # logic here, but largefile never actually had |
|
|||
235 | # ambiguity protection before, so this confuse |
|
|||
236 | # the tests and need more thinking. |
|
|||
237 | lfdirstate.set_clean(lfile, cache_data) |
|
236 | lfdirstate.set_clean(lfile, cache_data) | |
238 | else: |
|
237 | else: | |
239 | tocheck = unsure + modified + added + clean |
|
238 | tocheck = unsure + modified + added + clean |
General Comments 0
You need to be logged in to leave comments.
Login now