##// END OF EJS Templates
context: use "vfs.lstat()" instead of "os.lstat()"...
FUJIWARA Katsunori -
r19900:7c21e339 default
parent child Browse files
Show More
@@ -1111,11 +1111,11 b' class workingctx(committablectx):'
1111 ui, ds = self._repo.ui, self._repo.dirstate
1111 ui, ds = self._repo.ui, self._repo.dirstate
1112 try:
1112 try:
1113 rejected = []
1113 rejected = []
1114 lstat = self._repo.wvfs.lstat
1114 for f in list:
1115 for f in list:
1115 scmutil.checkportable(ui, join(f))
1116 scmutil.checkportable(ui, join(f))
1116 p = self._repo.wjoin(f)
1117 try:
1117 try:
1118 st = os.lstat(p)
1118 st = lstat(f)
1119 except OSError:
1119 except OSError:
1120 ui.warn(_("%s does not exist!\n") % join(f))
1120 ui.warn(_("%s does not exist!\n") % join(f))
1121 rejected.append(f)
1121 rejected.append(f)
@@ -1129,7 +1129,7 b' class workingctx(committablectx):'
1129 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
1129 if not (stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode)):
1130 ui.warn(_("%s not added: only files and symlinks "
1130 ui.warn(_("%s not added: only files and symlinks "
1131 "supported currently\n") % join(f))
1131 "supported currently\n") % join(f))
1132 rejected.append(p)
1132 rejected.append(f)
1133 elif ds[f] in 'amn':
1133 elif ds[f] in 'amn':
1134 ui.warn(_("%s already tracked!\n") % join(f))
1134 ui.warn(_("%s already tracked!\n") % join(f))
1135 elif ds[f] == 'r':
1135 elif ds[f] == 'r':
@@ -254,6 +254,9 b' class abstractvfs(object):'
254 def islink(self, path=None):
254 def islink(self, path=None):
255 return os.path.islink(self.join(path))
255 return os.path.islink(self.join(path))
256
256
257 def lstat(self, path=None):
258 return os.lstat(self.join(path))
259
257 def makedir(self, path=None, notindexed=True):
260 def makedir(self, path=None, notindexed=True):
258 return util.makedir(self.join(path), notindexed)
261 return util.makedir(self.join(path), notindexed)
259
262
General Comments 0
You need to be logged in to leave comments. Login now