equal
deleted
inserted
replaced
57 lock as lockmod, |
57 lock as lockmod, |
58 logcmdutil, |
58 logcmdutil, |
59 merge as mergemod, |
59 merge as mergemod, |
60 obsolete, |
60 obsolete, |
61 obsutil, |
61 obsutil, |
|
62 pathutil, |
62 phases, |
63 phases, |
63 policy, |
64 policy, |
64 pvec, |
65 pvec, |
65 pycompat, |
66 pycompat, |
66 registrar, |
67 registrar, |
1341 if nf != b'.': |
1342 if nf != b'.': |
1342 if ignore(nf): |
1343 if ignore(nf): |
1343 ignored = nf |
1344 ignored = nf |
1344 ignoredata = repo.dirstate._ignorefileandline(nf) |
1345 ignoredata = repo.dirstate._ignorefileandline(nf) |
1345 else: |
1346 else: |
1346 for p in util.finddirs(nf): |
1347 for p in pathutil.finddirs(nf): |
1347 if ignore(p): |
1348 if ignore(p): |
1348 ignored = p |
1349 ignored = p |
1349 ignoredata = repo.dirstate._ignorefileandline(p) |
1350 ignoredata = repo.dirstate._ignorefileandline(p) |
1350 break |
1351 break |
1351 if ignored: |
1352 if ignored: |