Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
forget: use vfs instead of os.path + match.rel() for filesystem checks
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 25 Dec 2014 21:43:45 -0500
changeset 23673 69cd91d04117
parent 23672 7853e8603f4a
child 23674 6e36b9fc7869
forget: use vfs instead of os.path + match.rel() for filesystem checks
hgext/largefiles/overrides.py file | annotate | diff | comparison | revisions
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- 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
--- 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)))
mercurial