diff options
| author | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-07-24 14:15:26 +0100 |
|---|---|---|
| committer | Adam Turner <9087854+aa-turner@users.noreply.github.com> | 2022-07-24 14:15:26 +0100 |
| commit | 19b54dce6a8535afdab2744cd09cef515a320982 (patch) | |
| tree | a94f53290cea7eb063cb2eb519b085c43b23b97a /sphinx/environment | |
| parent | 4f072b02ed914d4947c4415dcfb01752de65cea7 (diff) | |
| parent | 3c469c4258107589f35ae6612f5d7ecade97c805 (diff) | |
| download | sphinx-git-19b54dce6a8535afdab2744cd09cef515a320982.tar.gz | |
Merge branch '5.x'
# Conflicts:
# CHANGES
# sphinx/__init__.py
Diffstat (limited to 'sphinx/environment')
| -rw-r--r-- | sphinx/environment/adapters/toctree.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sphinx/environment/adapters/toctree.py b/sphinx/environment/adapters/toctree.py index 6db274000..9678e3c7c 100644 --- a/sphinx/environment/adapters/toctree.py +++ b/sphinx/environment/adapters/toctree.py @@ -74,7 +74,8 @@ class TocTree: # interactions between marking and pruning the tree (see bug #1046). toctree_ancestors = self.get_toctree_ancestors(docname) - excluded = Matcher(self.env.config.exclude_patterns, self.env.config.include_patterns) + included = Matcher(self.env.config.include_patterns) + excluded = Matcher(self.env.config.exclude_patterns) def _toctree_add_classes(node: Element, depth: int) -> None: """Add 'toctree-l%d' and 'current' classes to the toctree.""" @@ -166,6 +167,8 @@ class TocTree: # this is raised if the included file does not exist if excluded(self.env.doc2path(ref, False)): message = __('toctree contains reference to excluded document %r') + elif not included(self.env.doc2path(ref, False)): + message = __('toctree contains reference to non-included document %r') else: message = __('toctree contains reference to nonexisting document %r') |