equal
deleted
inserted
replaced
2326 except error.LookupError: |
2326 except error.LookupError: |
2327 ui.status(_("skipping missing subrepository: %s\n") |
2327 ui.status(_("skipping missing subrepository: %s\n") |
2328 % join(subpath)) |
2328 % join(subpath)) |
2329 |
2329 |
2330 # warn about failure to delete explicit files/dirs |
2330 # warn about failure to delete explicit files/dirs |
2331 deleteddirs = scmutil.dirs(deleted) |
2331 deleteddirs = util.dirs(deleted) |
2332 for f in m.files(): |
2332 for f in m.files(): |
2333 def insubrepo(): |
2333 def insubrepo(): |
2334 for subpath in wctx.substate: |
2334 for subpath in wctx.substate: |
2335 if f.startswith(subpath): |
2335 if f.startswith(subpath): |
2336 return True |
2336 return True |