Mercurial > hg
comparison mercurial/context.py @ 42100:b63b8b7ca5fa
messages: replace some instances of "folder" by "directory"
I'm pretty sure this is our preferred term.
Differential Revision: https://phab.mercurial-scm.org/D6222
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 10 Apr 2019 16:26:40 -0700 |
| parents | 6fef387af1da |
| children | f4b1f5537d4c |
comparison
equal
deleted
inserted
replaced
| 42099:bccb322f1496 | 42100:b63b8b7ca5fa |
|---|---|
| 1963 # omit the files which are deleted in current IMM wctx | 1963 # omit the files which are deleted in current IMM wctx |
| 1964 mfiles = [m for m in mfiles if m in self] | 1964 mfiles = [m for m in mfiles if m in self] |
| 1965 if not mfiles: | 1965 if not mfiles: |
| 1966 return | 1966 return |
| 1967 raise error.Abort("error: file '%s' cannot be written because " | 1967 raise error.Abort("error: file '%s' cannot be written because " |
| 1968 " '%s/' is a folder in %s (containing %d " | 1968 " '%s/' is a directory in %s (containing %d " |
| 1969 "entries: %s)" | 1969 "entries: %s)" |
| 1970 % (path, path, self.p1(), len(mfiles), | 1970 % (path, path, self.p1(), len(mfiles), |
| 1971 ', '.join(mfiles))) | 1971 ', '.join(mfiles))) |
| 1972 | 1972 |
| 1973 def write(self, path, data, flags='', **kwargs): | 1973 def write(self, path, data, flags='', **kwargs): |