mercurial/dirstate.py
changeset 48147 142e9f0a70b5
parent 48146 de0977ec2d25
child 48148 e2753a7acfa7
equal deleted inserted replaced
48146:de0977ec2d25 48147:142e9f0a70b5
  1370             size = t.size
  1370             size = t.size
  1371             time = t.mtime
  1371             time = t.mtime
  1372 
  1372 
  1373             if not st and t.tracked:
  1373             if not st and t.tracked:
  1374                 dadd(fn)
  1374                 dadd(fn)
  1375             elif t.merged:
  1375             elif t.merged or t.from_p2:
  1376                 madd(fn)
  1376                 madd(fn)
  1377             elif t.added:
  1377             elif t.added:
  1378                 aadd(fn)
  1378                 aadd(fn)
  1379             elif t.removed:
  1379             elif t.removed:
  1380                 radd(fn)
  1380                 radd(fn)
  1383                     size >= 0
  1383                     size >= 0
  1384                     and (
  1384                     and (
  1385                         (size != st.st_size and size != st.st_size & _rangemask)
  1385                         (size != st.st_size and size != st.st_size & _rangemask)
  1386                         or ((mode ^ st.st_mode) & 0o100 and checkexec)
  1386                         or ((mode ^ st.st_mode) & 0o100 and checkexec)
  1387                     )
  1387                     )
  1388                     or t.from_p2
       
  1389                     or fn in copymap
  1388                     or fn in copymap
  1390                 ):
  1389                 ):
  1391                     if stat.S_ISLNK(st.st_mode) and size != st.st_size:
  1390                     if stat.S_ISLNK(st.st_mode) and size != st.st_size:
  1392                         # issue6456: Size returned may be longer due to
  1391                         # issue6456: Size returned may be longer due to
  1393                         # encryption on EXT-4 fscrypt, undecided.
  1392                         # encryption on EXT-4 fscrypt, undecided.