Show More
@@ -509,14 +509,13 b' class dirstate(object):' | |||||
509 | results[nf] = None |
|
509 | results[nf] = None | |
510 | except OSError, inst: |
|
510 | except OSError, inst: | |
511 | keep = False |
|
511 | keep = False | |
|
512 | if nf in dmap: # does it exactly match a file? | |||
|
513 | results[nf] = None | |||
|
514 | keep = True | |||
|
515 | else: # does it match a directory? | |||
512 | prefix = nf + "/" |
|
516 | prefix = nf + "/" | |
513 | for fn in dmap: |
|
517 | for fn in dmap: | |
514 |
if |
|
518 | if fn.startswith(prefix): | |
515 | if matchfn(nf): |
|
|||
516 | results[nf] = None |
|
|||
517 | keep = True |
|
|||
518 | break |
|
|||
519 | elif fn.startswith(prefix): |
|
|||
520 | dostep3 = True |
|
519 | dostep3 = True | |
521 | keep = True |
|
520 | keep = True | |
522 | break |
|
521 | break |
General Comments 0
You need to be logged in to leave comments.
Login now