mercurial/dirstate.py
changeset 6824 c3fb7dc51a4b
parent 6823 12081ea61a34
child 6825 177b3186f78a
equal deleted inserted replaced
6823:12081ea61a34 6824:c3fb7dc51a4b
   517                     nd = ''
   517                     nd = ''
   518                 else:
   518                 else:
   519                     # do not recurse into a repo contained in this
   519                     # do not recurse into a repo contained in this
   520                     # one. use bisect to find .hg directory so speed
   520                     # one. use bisect to find .hg directory so speed
   521                     # is good on big directory.
   521                     # is good on big directory.
   522                     names = [e[0] for e in entries]
   522                     hg = bisect_left(entries, ('.hg'))
   523                     hg = bisect_left(names, '.hg')
   523                     if hg < len(entries) and entries[hg][0] == '.hg' \
   524                     if hg < len(names) and names[hg] == '.hg':
   524                             and entries[hg][1] == stat.S_IFDIR:
   525                         if isdir(_join(join(nd, '.hg'))):
       
   526                             continue
   525                             continue
   527                 for f, kind, st in entries:
   526                 for f, kind, st in entries:
   528                     nf = normalize(pconvert(join(nd, f)))
   527                     nf = normalize(pconvert(join(nd, f)))
   529                     if nf in seen:
   528                     if nf in seen:
   530                         continue
   529                         continue