Show More
@@ -808,17 +808,19 b' class localrepository(repo.repository):' | |||||
808 |
|
808 | |||
809 | # make sure all explicit patterns are matched |
|
809 | # make sure all explicit patterns are matched | |
810 | if not force and match.files(): |
|
810 | if not force and match.files(): | |
811 |
|
|
811 | matched = set(changes[0] + changes[1] + changes[2]) | |
812 |
|
812 | |||
813 | for f in match.files(): |
|
813 | for f in match.files(): | |
814 |
if f == '.' or f in |
|
814 | if f == '.' or f in matched: # matched | |
815 | continue |
|
815 | continue | |
816 | if f in changes[3]: # missing |
|
816 | if f in changes[3]: # missing | |
817 | fail(f, _('file not found!')) |
|
817 | fail(f, _('file not found!')) | |
818 | if f in vdirs: # visited directory |
|
818 | if f in vdirs: # visited directory | |
819 | d = f + '/' |
|
819 | d = f + '/' | |
820 |
|
|
820 | for mf in matched: | |
821 |
if |
|
821 | if mf.startswith(d): | |
|
822 | break | |||
|
823 | else: | |||
822 | fail(f, _("no match under directory!")) |
|
824 | fail(f, _("no match under directory!")) | |
823 | elif f not in self.dirstate: |
|
825 | elif f not in self.dirstate: | |
824 | fail(f, _("file not tracked!")) |
|
826 | fail(f, _("file not tracked!")) |
General Comments 0
You need to be logged in to leave comments.
Login now