# HG changeset patch # User Matt Harbison # Date 1419561825 18000 # Node ID 69cd91d04117685a265a8cb1acf2ef1a1eb156a0 # Parent 7853e8603f4ae832400bbd74d994901bfe54fe82 forget: use vfs instead of os.path + match.rel() for filesystem checks diff -r 7853e8603f4a -r 69cd91d04117 hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py Wed Dec 24 12:07:59 2014 -0500 +++ b/hgext/largefiles/overrides.py Thu Dec 25 21:43:45 2014 -0500 @@ -971,7 +971,7 @@ for f in forget: if lfutil.standin(f) not in repo.dirstate and not \ - os.path.isdir(m.rel(lfutil.standin(f))): + repo.wvfs.isdir(lfutil.standin(f)): ui.warn(_('not removing %s: file is already untracked\n') % m.rel(f)) result = 1 diff -r 7853e8603f4a -r 69cd91d04117 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Wed Dec 24 12:07:59 2014 -0500 +++ b/mercurial/cmdutil.py Thu Dec 25 21:43:45 2014 -0500 @@ -2037,9 +2037,9 @@ if not explicitonly: for f in match.files(): - if f not in repo.dirstate and not os.path.isdir(match.rel(join(f))): + if f not in repo.dirstate and not repo.wvfs.isdir(f): if f not in forgot: - if os.path.exists(match.rel(join(f))): + if repo.wvfs.exists(f): ui.warn(_('not removing %s: ' 'file is already untracked\n') % match.rel(join(f)))