##// END OF EJS Templates
largefile: use the proper "mtime boundary" logic during fixup...
marmoute -
r49219:a96a5d62 default draft
parent child Browse files
Show More
@@ -261,13 +261,10 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 cache_data = (mode, size, mtime)
265 if mtime is not None:
266 # We should consider using the mtime_boundary
266 cache_data = (mode, size, mtime)
267 # logic here, but largefile never actually had
267 lfdirstate.set_clean(lfile, cache_data)
268 # ambiguity protection before, so this confuse
269 # the tests and need more thinking.
270 lfdirstate.set_clean(lfile, cache_data)
271 return s
268 return s
272
269
273
270
@@ -228,13 +228,12 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(s)
231 mtime = timestamp.reliable_mtime_of(
232 cache_data = (mode, size, mtime)
232 s, mtime_boundary
233 # We should consider using the mtime_boundary
233 )
234 # logic here, but largefile never actually had
234 if mtime is not None:
235 # ambiguity protection before, so this confuse
235 cache_data = (mode, size, mtime)
236 # the tests and need more thinking.
236 lfdirstate.set_clean(lfile, cache_data)
237 lfdirstate.set_clean(lfile, cache_data)
238 else:
237 else:
239 tocheck = unsure + modified + added + clean
238 tocheck = unsure + modified + added + clean
240 modified, added, clean = [], [], []
239 modified, added, clean = [], [], []
General Comments 0
You need to be logged in to leave comments. Login now