comparison hgext/largefiles/overrides.py @ 23673:69cd91d04117

forget: use vfs instead of os.path + match.rel() for filesystem checks
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 25 Dec 2014 21:43:45 -0500
parents 55c92618fdd4
children 3314664606e6
comparison
equal deleted inserted replaced
23672:7853e8603f4a 23673:69cd91d04117
969 forget = sorted(s.modified + s.added + s.deleted + s.clean) 969 forget = sorted(s.modified + s.added + s.deleted + s.clean)
970 forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()] 970 forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()]
971 971
972 for f in forget: 972 for f in forget:
973 if lfutil.standin(f) not in repo.dirstate and not \ 973 if lfutil.standin(f) not in repo.dirstate and not \
974 os.path.isdir(m.rel(lfutil.standin(f))): 974 repo.wvfs.isdir(lfutil.standin(f)):
975 ui.warn(_('not removing %s: file is already untracked\n') 975 ui.warn(_('not removing %s: file is already untracked\n')
976 % m.rel(f)) 976 % m.rel(f))
977 result = 1 977 result = 1
978 978
979 for f in forget: 979 for f in forget: