##// END OF EJS Templates
workingctx: use normal dirs() instead of dirstate.dirs()...
Durham Goode -
r24213:e0c1328d default
parent child Browse files
Show More
@@ -2071,6 +2071,7 b' def remove(ui, repo, m, prefix, after, f'
2071 2071 % join(subpath))
2072 2072
2073 2073 # warn about failure to delete explicit files/dirs
2074 deleteddirs = scmutil.dirs(deleted)
2074 2075 for f in m.files():
2075 2076 def insubrepo():
2076 2077 for subpath in wctx.substate:
@@ -2078,7 +2079,8 b' def remove(ui, repo, m, prefix, after, f'
2078 2079 return True
2079 2080 return False
2080 2081
2081 if f in repo.dirstate or f in wctx.dirs() or f == '.' or insubrepo():
2082 isdir = f in deleteddirs or f in wctx.dirs()
2083 if f in repo.dirstate or isdir or f == '.' or insubrepo():
2082 2084 continue
2083 2085
2084 2086 if repo.wvfs.exists(f):
@@ -1289,9 +1289,6 b' class committablectx(basectx):'
1289 1289 self._repo.dirstate.setparents(node)
1290 1290 self._repo.dirstate.endparentchange()
1291 1291
1292 def dirs(self):
1293 return self._repo.dirstate.dirs()
1294
1295 1292 class workingctx(committablectx):
1296 1293 """A workingctx object makes access to data related to
1297 1294 the current working directory convenient.
General Comments 0
You need to be logged in to leave comments. Login now