1220 opts = {} |
1220 opts = {} |
1221 if not lfutil.islfilesrepo(repo): |
1221 if not lfutil.islfilesrepo(repo): |
1222 return orig(repo, matcher, prefix, uipathfn, opts) |
1222 return orig(repo, matcher, prefix, uipathfn, opts) |
1223 # Get the list of missing largefiles so we can remove them |
1223 # Get the list of missing largefiles so we can remove them |
1224 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
1224 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
1225 unsure, s = lfdirstate.status(matchmod.always(repo.root, repo.getcwd()), |
1225 unsure, s = lfdirstate.status(matchmod.always(), subrepos=[], |
1226 subrepos=[], ignored=False, clean=False, |
1226 ignored=False, clean=False, unknown=False) |
1227 unknown=False) |
|
1228 |
1227 |
1229 # Call into the normal remove code, but the removing of the standin, we want |
1228 # Call into the normal remove code, but the removing of the standin, we want |
1230 # to have handled by original addremove. Monkey patching here makes sure |
1229 # to have handled by original addremove. Monkey patching here makes sure |
1231 # we don't remove the standin in the largefiles code, preventing a very |
1230 # we don't remove the standin in the largefiles code, preventing a very |
1232 # confused state later. |
1231 # confused state later. |
1412 # |
1411 # |
1413 # (*) don't care |
1412 # (*) don't care |
1414 # (*1) deprecated, but used internally (e.g: "rebase --collapse") |
1413 # (*1) deprecated, but used internally (e.g: "rebase --collapse") |
1415 |
1414 |
1416 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
1415 lfdirstate = lfutil.openlfdirstate(repo.ui, repo) |
1417 unsure, s = lfdirstate.status(matchmod.always(repo.root, |
1416 unsure, s = lfdirstate.status(matchmod.always(), subrepos=[], |
1418 repo.getcwd()), |
1417 ignored=False, clean=True, unknown=False) |
1419 subrepos=[], ignored=False, |
|
1420 clean=True, unknown=False) |
|
1421 oldclean = set(s.clean) |
1418 oldclean = set(s.clean) |
1422 pctx = repo['.'] |
1419 pctx = repo['.'] |
1423 dctx = repo[node] |
1420 dctx = repo[node] |
1424 for lfile in unsure + s.modified: |
1421 for lfile in unsure + s.modified: |
1425 lfileabs = repo.wvfs.join(lfile) |
1422 lfileabs = repo.wvfs.join(lfile) |