Show More
@@ -754,9 +754,10 b' class dirstate(object):' | |||||
754 |
|
754 | |||
755 | skipstep3 = skipstep3 and not (work or dirsnotfound) |
|
755 | skipstep3 = skipstep3 and not (work or dirsnotfound) | |
756 | work = [d for d in work if not dirignore(d[0])] |
|
756 | work = [d for d in work if not dirignore(d[0])] | |
757 | wadd = work.append |
|
|||
758 |
|
757 | |||
759 | # step 2: visit subdirectories |
|
758 | # step 2: visit subdirectories | |
|
759 | def traverse(work): | |||
|
760 | wadd = work.append | |||
760 | while work: |
|
761 | while work: | |
761 | nd, d = work.pop() |
|
762 | nd, d = work.pop() | |
762 | skip = None |
|
763 | skip = None | |
@@ -774,10 +775,11 b' class dirstate(object):' | |||||
774 | raise |
|
775 | raise | |
775 | for f, kind, st in entries: |
|
776 | for f, kind, st in entries: | |
776 | if normalizefile: |
|
777 | if normalizefile: | |
777 |
# even though f might be a directory, we're only |
|
778 | # even though f might be a directory, we're only | |
778 |
# in comparing it to files currently in the |
|
779 | # interested in comparing it to files currently in the | |
779 | # therefore normalizefile is enough |
|
780 | # dmap -- therefore normalizefile is enough | |
780 |
nf = normalizefile(nd and (nd + "/" + f) or f, True, |
|
781 | nf = normalizefile(nd and (nd + "/" + f) or f, True, | |
|
782 | True) | |||
781 | f = d and (d + "/" + f) or f |
|
783 | f = d and (d + "/" + f) or f | |
782 | else: |
|
784 | else: | |
783 | nf = nd and (nd + "/" + f) or f |
|
785 | nf = nd and (nd + "/" + f) or f | |
@@ -799,6 +801,8 b' class dirstate(object):' | |||||
799 | elif nf in dmap and (matchalways or matchfn(nf)): |
|
801 | elif nf in dmap and (matchalways or matchfn(nf)): | |
800 | results[nf] = None |
|
802 | results[nf] = None | |
801 |
|
803 | |||
|
804 | traverse(work) | |||
|
805 | ||||
802 | for s in subrepos: |
|
806 | for s in subrepos: | |
803 | del results[s] |
|
807 | del results[s] | |
804 | del results['.hg'] |
|
808 | del results['.hg'] |
General Comments 0
You need to be logged in to leave comments.
Login now