Show More
@@ -52,7 +52,10 b' class dirstate(object):' | |||||
52 | self._incpath(f) |
|
52 | self._incpath(f) | |
53 | return self._dirs |
|
53 | return self._dirs | |
54 | elif name == '_ignore': |
|
54 | elif name == '_ignore': | |
55 |
files = [self.wjoin('.hgignore')] |
|
55 | files = [self.wjoin('.hgignore')] | |
|
56 | for name, path in self._ui.configitems("ui"): | |||
|
57 | if name == 'ignore' or name.startswith('ignore.'): | |||
|
58 | files.append(os.path.expanduser(path)) | |||
56 | self._ignore = ignore.ignore(self._root, files, self._ui.warn) |
|
59 | self._ignore = ignore.ignore(self._root, files, self._ui.warn) | |
57 | return self._ignore |
|
60 | return self._ignore | |
58 | elif name == '_slash': |
|
61 | elif name == '_slash': |
@@ -312,13 +312,6 b' class ui(object):' | |||||
312 | for name, value in self.configitems(section, untrusted): |
|
312 | for name, value in self.configitems(section, untrusted): | |
313 | yield section, name, str(value).replace('\n', '\\n') |
|
313 | yield section, name, str(value).replace('\n', '\\n') | |
314 |
|
314 | |||
315 | def hgignorefiles(self): |
|
|||
316 | result = [] |
|
|||
317 | for key, value in self.configitems("ui"): |
|
|||
318 | if key == 'ignore' or key.startswith('ignore.'): |
|
|||
319 | result.append(os.path.expanduser(value)) |
|
|||
320 | return result |
|
|||
321 |
|
||||
322 | def username(self): |
|
315 | def username(self): | |
323 | """Return default username to be used in commits. |
|
316 | """Return default username to be used in commits. | |
324 |
|
317 |
General Comments 0
You need to be logged in to leave comments.
Login now