Mercurial > hg
changeset 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 | bccb322f1496 |
| children | f4b1f5537d4c |
| files | mercurial/context.py mercurial/debugcommands.py tests/test-rebase-inmemory.t |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/context.py Thu Apr 11 18:34:56 2019 +0200 +++ b/mercurial/context.py Wed Apr 10 16:26:40 2019 -0700 @@ -1965,7 +1965,7 @@ if not mfiles: return raise error.Abort("error: file '%s' cannot be written because " - " '%s/' is a folder in %s (containing %d " + " '%s/' is a directory in %s (containing %d " "entries: %s)" % (path, path, self.p1(), len(mfiles), ', '.join(mfiles)))
--- a/mercurial/debugcommands.py Thu Apr 11 18:34:56 2019 +0200 +++ b/mercurial/debugcommands.py Wed Apr 10 16:26:40 2019 -0700 @@ -1143,7 +1143,7 @@ ui.write(_("%s is ignored\n") % uipathfn(f)) else: ui.write(_("%s is ignored because of " - "containing folder %s\n") + "containing directory %s\n") % (uipathfn(f), ignored)) ignorefile, lineno, line = ignoredata ui.write(_("(ignore rule in %s, line %d: '%s')\n")
--- a/tests/test-rebase-inmemory.t Thu Apr 11 18:34:56 2019 +0200 +++ b/tests/test-rebase-inmemory.t Wed Apr 10 16:26:40 2019 -0700 @@ -252,7 +252,7 @@ $ hg rebase -r 3 -d . -n starting dry-run rebase; repository will not be changed rebasing 3:844a7de3e617 "c" - abort: error: file 'c' cannot be written because 'c/' is a folder in e147e6e3c490 (containing 1 entries: c/subdir/file.txt) + abort: error: file 'c' cannot be written because 'c/' is a directory in e147e6e3c490 (containing 1 entries: c/subdir/file.txt) [255] $ cd ..