Show More
@@ -492,11 +492,18 b' class dirstate(object):' | |||||
492 | nd = work.pop() |
|
492 | nd = work.pop() | |
493 | if hasattr(match, 'dir'): |
|
493 | if hasattr(match, 'dir'): | |
494 | match.dir(nd) |
|
494 | match.dir(nd) | |
|
495 | skip = None | |||
495 | if nd == '.': |
|
496 | if nd == '.': | |
496 | nd = '' |
|
497 | nd = '' | |
497 | entries = listdir(join(nd), stat=True) |
|
|||
498 | else: |
|
498 | else: | |
499 | entries = listdir(join(nd), stat=True, skip ='.hg') |
|
499 | skip = '.hg' | |
|
500 | try: | |||
|
501 | entries = listdir(join(nd), stat=True, skip=skip) | |||
|
502 | except OSError, inst: | |||
|
503 | if inst.errno == errno.EACCES: | |||
|
504 | fwarn(nd, inst.strerror) | |||
|
505 | continue | |||
|
506 | raise | |||
500 | for f, kind, st in entries: |
|
507 | for f, kind, st in entries: | |
501 | nf = normalize(nd and (nd + "/" + f) or f, True) |
|
508 | nf = normalize(nd and (nd + "/" + f) or f, True) | |
502 | if nf not in results: |
|
509 | if nf not in results: |
General Comments 0
You need to be logged in to leave comments.
Login now