equal
deleted
inserted
replaced
1313 size = t[2] |
1313 size = t[2] |
1314 time = t[3] |
1314 time = t[3] |
1315 |
1315 |
1316 if not st and t.tracked: |
1316 if not st and t.tracked: |
1317 dadd(fn) |
1317 dadd(fn) |
|
1318 elif t.merged: |
|
1319 madd(fn) |
|
1320 elif t.added: |
|
1321 aadd(fn) |
|
1322 elif t.removed: |
|
1323 radd(fn) |
1318 elif state == b'n': |
1324 elif state == b'n': |
1319 if ( |
1325 if ( |
1320 size >= 0 |
1326 size >= 0 |
1321 and ( |
1327 and ( |
1322 (size != st.st_size and size != st.st_size & _rangemask) |
1328 (size != st.st_size and size != st.st_size & _rangemask) |
1342 # This can happen if we quickly do multiple commits. |
1348 # This can happen if we quickly do multiple commits. |
1343 # Force lookup, so we don't miss such a racy file change. |
1349 # Force lookup, so we don't miss such a racy file change. |
1344 ladd(fn) |
1350 ladd(fn) |
1345 elif listclean: |
1351 elif listclean: |
1346 cadd(fn) |
1352 cadd(fn) |
1347 elif t.merged: |
|
1348 madd(fn) |
|
1349 elif t.added: |
|
1350 aadd(fn) |
|
1351 elif t.removed: |
|
1352 radd(fn) |
|
1353 status = scmutil.status( |
1353 status = scmutil.status( |
1354 modified, added, removed, deleted, unknown, ignored, clean |
1354 modified, added, removed, deleted, unknown, ignored, clean |
1355 ) |
1355 ) |
1356 return (lookup, status) |
1356 return (lookup, status) |
1357 |
1357 |