##// END OF EJS Templates
dirstate.walk: remove subrepo and .hg from results before step 3...
Siddharth Agarwal -
r18812:1c40526d default
parent child Browse files
Show More
@@ -698,6 +698,10 b' class dirstate(object):'
698 elif nf in dmap and matchfn(nf):
698 elif nf in dmap and matchfn(nf):
699 results[nf] = None
699 results[nf] = None
700
700
701 for s in subrepos:
702 del results[s]
703 del results['.hg']
704
701 # step 3: report unseen items in the dmap hash
705 # step 3: report unseen items in the dmap hash
702 if not skipstep3 and not exact:
706 if not skipstep3 and not exact:
703 visit = sorted([f for f in dmap if f not in results and matchfn(f)])
707 visit = sorted([f for f in dmap if f not in results and matchfn(f)])
@@ -725,9 +729,6 b' class dirstate(object):'
725 nf = iter(visit).next
729 nf = iter(visit).next
726 for st in util.statfiles([join(i) for i in visit]):
730 for st in util.statfiles([join(i) for i in visit]):
727 results[nf()] = st
731 results[nf()] = st
728 for s in subrepos:
729 del results[s]
730 del results['.hg']
731 return results
732 return results
732
733
733 def status(self, match, subrepos, ignored, clean, unknown):
734 def status(self, match, subrepos, ignored, clean, unknown):
General Comments 0
You need to be logged in to leave comments. Login now