# HG changeset patch # User Matt Harbison # Date 1419562235 18000 # Node ID 6e36b9fc78699801b16ea2c763f1483d1fa755d4 # Parent 69cd91d04117685a265a8cb1acf2ef1a1eb156a0 remove: use vfs instead of os.path + match.rel() for filesystem checks diff -r 69cd91d04117 -r 6e36b9fc7869 mercurial/cmdutil.py --- a/mercurial/cmdutil.py Thu Dec 25 21:43:45 2014 -0500 +++ b/mercurial/cmdutil.py Thu Dec 25 21:50:35 2014 -0500 @@ -2092,8 +2092,8 @@ if f in repo.dirstate or f in wctx.dirs() or f == '.' or insubrepo(): continue - if os.path.exists(m.rel(join(f))): - if os.path.isdir(m.rel(join(f))): + if repo.wvfs.exists(f): + if repo.wvfs.isdir(f): ui.warn(_('not removing %s: no tracked files\n') % m.rel(join(f))) else: