IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #8933: viewcode: Failed to create back-links on parallel build

Browse Source 
On parallel build mode, viewcode losts the back-links information on
gathering results from each process.  As a result, some back-links are
missing in the generated viewcode pages.

This fixes the merging back-links process for parallel builds.
This commit is contained in:
Takeshi KOMIYA
2021-02-26 01:51:01 +09:00
parent 4392557943
commit 255b4aee05
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -83,6 +83,7 @@ Bugs fixed
:confval:`cpp_index_common_prefix` instead of the first that matches. :confval:`cpp_index_common_prefix` instead of the first that matches.
* C, properly reject function declarations when a keyword is used * C, properly reject function declarations when a keyword is used
as parameter name. as parameter name.
* #8933: viewcode: Failed to create back-links on parallel build
Testing Testing
-------- --------

9
sphinx/ext/viewcode.py
View File

@@ -146,7 +146,14 @@ def env_merge_info(app: Sphinx, env: BuildEnvironment, docnames: Iterable[str],
if not hasattr(env, '_viewcode_modules'): if not hasattr(env, '_viewcode_modules'):
env._viewcode_modules = {} # type: ignore env._viewcode_modules = {} # type: ignore
# now merge in the information from the subprocess # now merge in the information from the subprocess
env._viewcode_modules.update(other._viewcode_modules) # type: ignore for modname, entry in other._viewcode_modules.items(): # type: ignore
if modname not in env._viewcode_modules: # type: ignore
env._viewcode_modules[modname] = entry # type: ignore
else:
used = env._viewcode_modules[modname][2] # type: ignore
for fullname, docname in entry[2].items():
if fullname not in used:
used[fullname] = docname
def env_purge_doc(app: Sphinx, env: BuildEnvironment, docname: str) -> None: def env_purge_doc(app: Sphinx, env: BuildEnvironment, docname: str) -> None: