_includes: better error on including directory

Previously, include a directory result in an error like this:

    mydir is a directory. bst command expects a .bst file.

Note that the file containing the include was not mentioned.

Now we get an error like this instead:

    element.bst [line 12 column 0]: Include block references a
    directory instead of a file: 'mydir'.

2 files changed, 25 insertions, 0 deletions

diff --git a/buildstream/_includes.py b/buildstream/_includes.py
index cb7faa4de..7548e155c 100644
--- a/buildstream/_includes.py
+++ b/buildstream/_includes.py
@@ -58,6 +58,10 @@ class Includes:
                         message = "{}: Include block references a file that could not be found: '{}'.".format(
                             include_provenance, include)
                         raise LoadError(LoadErrorReason.MISSING_FILE, message) from e
+                    elif e.reason == LoadErrorReason.LOADING_DIRECTORY:
+                        message = "{}: Include block references a directory instead of a file: '{}'.".format(
+                            include_provenance, include)
+                        raise LoadError(LoadErrorReason.LOADING_DIRECTORY, message) from e
                     else:
                         raise
 
diff --git a/tests/format/include.py b/tests/format/include.py
index 536f9faaf..95b78d96e 100644
--- a/tests/format/include.py
+++ b/tests/format/include.py
@@ -47,6 +47,27 @@ def test_include_missing_file(cli, tmpdir):
     assert 'line 4 column 2' in result.stderr
 
 
+def test_include_dir(cli, tmpdir):
+    tmpdir.join('project.conf').write('{"name": "test"}')
+    tmpdir.mkdir('subdir')
+    element = tmpdir.join('include_dir.bst')
+
+    # Normally we would use dicts and _yaml.dump to write such things, but here
+    # we want to be sure of a stable line and column number.
+    element.write(textwrap.dedent("""
+        kind: manual
+
+        "(@)":
+          - subdir/
+    """).strip())
+
+    result = cli.run(project=str(tmpdir), args=['show', str(element.basename)])
+    result.assert_main_error(
+        ErrorDomain.LOAD, LoadErrorReason.LOADING_DIRECTORY)
+    # Make sure the root cause provenance is in the output.
+    assert 'line 4 column 2' in result.stderr
+
+
 @pytest.mark.datafiles(DATA_DIR)
 def test_include_junction_file(cli, tmpdir, datafiles):
     project = os.path.join(str(datafiles), 'junction')