# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-04-10 23:26:40
# Node ID b63b8b7ca5fad19a756045e49028463595de0560
# Parent  bccb322f1496e166f63c167b8685c75ea2d3e4b2

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

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1965,7 +1965,7 @@ class overlayworkingctx(committablectx):
             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)))
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -1143,7 +1143,7 @@ def debugignore(ui, repo, *files, **opts
                     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")
diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -252,7 +252,7 @@ Test reporting of path conflicts
   $ 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 ..