Show More
@@ -769,7 +769,6 b' class dirstate(object):' | |||||
769 | kind = _(b'directory') |
|
769 | kind = _(b'directory') | |
770 | return _(b'unsupported file type (type is %s)') % kind |
|
770 | return _(b'unsupported file type (type is %s)') % kind | |
771 |
|
771 | |||
772 | matchedir = match.explicitdir |
|
|||
773 | badfn = match.bad |
|
772 | badfn = match.bad | |
774 | dmap = self._map |
|
773 | dmap = self._map | |
775 | lstat = os.lstat |
|
774 | lstat = os.lstat | |
@@ -823,8 +822,6 b' class dirstate(object):' | |||||
823 | if nf in dmap: |
|
822 | if nf in dmap: | |
824 | # file replaced by dir on disk but still in dirstate |
|
823 | # file replaced by dir on disk but still in dirstate | |
825 | results[nf] = None |
|
824 | results[nf] = None | |
826 | if matchedir: |
|
|||
827 | matchedir(nf) |
|
|||
828 | foundadd((nf, ff)) |
|
825 | foundadd((nf, ff)) | |
829 | elif kind == regkind or kind == lnkkind: |
|
826 | elif kind == regkind or kind == lnkkind: | |
830 | results[nf] = st |
|
827 | results[nf] = st | |
@@ -837,8 +834,6 b' class dirstate(object):' | |||||
837 | results[nf] = None |
|
834 | results[nf] = None | |
838 | else: # does it match a missing directory? |
|
835 | else: # does it match a missing directory? | |
839 | if self._map.hasdir(nf): |
|
836 | if self._map.hasdir(nf): | |
840 | if matchedir: |
|
|||
841 | matchedir(nf) |
|
|||
842 | notfoundadd(nf) |
|
837 | notfoundadd(nf) | |
843 | else: |
|
838 | else: | |
844 | badfn(ff, encoding.strtolocal(inst.strerror)) |
|
839 | badfn(ff, encoding.strtolocal(inst.strerror)) |
General Comments 0
You need to be logged in to leave comments.
Login now