Show More
@@ -62,7 +62,8 class dirstate(object): | |||||
62 | elif line[i] == '#': break |
|
62 | elif line[i] == '#': break | |
63 | line = line[:i].rstrip() |
|
63 | line = line[:i].rstrip() | |
64 | if line: yield line |
|
64 | if line: yield line | |
65 |
|
|
65 | repoignore = self.wjoin('.hgignore') | |
|
66 | files = [repoignore] | |||
66 | files.extend(self.ui.hgignorefiles()) |
|
67 | files.extend(self.ui.hgignorefiles()) | |
67 | pats = [] |
|
68 | pats = [] | |
68 | for f in files: |
|
69 | for f in files: | |
@@ -84,7 +85,9 class dirstate(object): | |||||
84 | pat = line |
|
85 | pat = line | |
85 | break |
|
86 | break | |
86 | pats.append(pat) |
|
87 | pats.append(pat) | |
87 |
except IOError: |
|
88 | except IOError: | |
|
89 | if f != repoignore: | |||
|
90 | self.ui.warn(_("ignore file %s not found\n") % f) | |||
88 | return pats |
|
91 | return pats | |
89 |
|
92 | |||
90 | def ignore(self, fn): |
|
93 | def ignore(self, fn): |
General Comments 0
You need to be logged in to leave comments.
Login now