Show More
@@ -590,7 +590,7 b' class dirstate(object):' | |||||
590 | for src, fn, st in self.statwalk(files, match, unknown=list_unknown, |
|
590 | for src, fn, st in self.statwalk(files, match, unknown=list_unknown, | |
591 | ignored=list_ignored): |
|
591 | ignored=list_ignored): | |
592 | if fn in dmap: |
|
592 | if fn in dmap: | |
593 |
|
|
593 | state, mode, size, time, foo = dmap[fn] | |
594 | else: |
|
594 | else: | |
595 | if (list_ignored or fn in files) and self._dirignore(fn): |
|
595 | if (list_ignored or fn in files) and self._dirignore(fn): | |
596 | if list_ignored: |
|
596 | if list_ignored: | |
@@ -612,11 +612,11 b' class dirstate(object):' | |||||
612 | nonexistent = False |
|
612 | nonexistent = False | |
613 | # XXX: what to do with file no longer present in the fs |
|
613 | # XXX: what to do with file no longer present in the fs | |
614 | # who are not removed in the dirstate ? |
|
614 | # who are not removed in the dirstate ? | |
615 |
if nonexistent and |
|
615 | if nonexistent and state in "nma": | |
616 | dadd(fn) |
|
616 | dadd(fn) | |
617 | continue |
|
617 | continue | |
618 | # check the common case first |
|
618 | # check the common case first | |
619 |
if |
|
619 | if state == 'n': | |
620 | if not st: |
|
620 | if not st: | |
621 | st = lstat(_join(fn)) |
|
621 | st = lstat(_join(fn)) | |
622 | if (size >= 0 and |
|
622 | if (size >= 0 and | |
@@ -629,11 +629,11 b' class dirstate(object):' | |||||
629 | ladd(fn) |
|
629 | ladd(fn) | |
630 | elif list_clean: |
|
630 | elif list_clean: | |
631 | cadd(fn) |
|
631 | cadd(fn) | |
632 |
elif |
|
632 | elif state == 'm': | |
633 | madd(fn) |
|
633 | madd(fn) | |
634 |
elif |
|
634 | elif state == 'a': | |
635 | aadd(fn) |
|
635 | aadd(fn) | |
636 |
elif |
|
636 | elif state == 'r': | |
637 | radd(fn) |
|
637 | radd(fn) | |
638 |
|
638 | |||
639 | return (lookup, modified, added, removed, deleted, unknown, ignored, |
|
639 | return (lookup, modified, added, removed, deleted, unknown, ignored, |
General Comments 0
You need to be logged in to leave comments.
Login now