multiple vcs: detect vcs at each call

Author: cdevienne

src/towncrier/_hg.py

@@ -37,7 +37,6 @@ def _topic_enabled(directory: str):
 
 
 def has_topics(directory: str) -> bool:
-    global _has_topics_cache
     if directory not in _has_topics_cache:
         _has_topics_cache[directory] = _topic_enabled(directory)
     return _has_topics_cache[directory]
@@ -96,4 +95,4 @@ def list_changed_files_compared_to_branch(
         stderr=STDOUT,
     ).splitlines()
 
-    return [l.split("|")[0].strip() for l in output if "|" in l]
+    return [line.split("|")[0].strip() for line in output if "|" in line]

src/towncrier/_novcs.py

@@ -0,0 +1,29 @@
+import os
+
+from typing import Container
+
+
+def get_default_compare_branch(branches: Container[str]) -> str | None:
+    return None
+
+
+def remove_files(fragment_filenames: list[str]) -> None:
+    if not fragment_filenames:
+        return
+
+    for fragment in fragment_filenames:
+        os.remove(fragment)
+
+
+def stage_newsfile(directory: str, filename: str) -> None:
+    return
+
+
+def get_remote_branches(base_directory: str) -> list[str]:
+    return []
+
+
+def list_changed_files_compared_to_branch(
+    base_directory: str, compare_with: str, include_staged: bool
+) -> list[str]:
+    return []

src/towncrier/_vcs.py

@@ -1,30 +1,46 @@
 import os
 
-if os.path.exists(".git"):
-    flavor = "git"
-    from ._git import *
+from typing import Container
 
-elif os.path.exists(".hg"):
-    flavor = "hg"
-    from ._hg import *
 
-else:
-    flavor = "none"
+def _get_mod(base_directory: str):
+    if os.path.exists(os.path.join(base_directory, ".git")):
+        from . import _git
 
-    def remove_files(fragment_filenames: list[str]) -> None:
-        if not fragment_filenames:
-            return
+        return _git
+    elif os.path.exists(os.path.join(base_directory, ".hg")):
+        from . import _hg
 
-        for fragment in fragment_filenames:
-            os.remove(fragment)
+        return _hg
+    else:
+        from . import _novcs
 
-    def stage_newsfile(directory: str, filename: str) -> None:
-        return
+        return _novcs
 
-    def get_remote_branches(base_directory: str) -> list[str]:
-        return []
 
-    def list_changed_files_compared_to_branch(
-        base_directory: str, compare_with: str, include_staged: bool
-    ) -> list[str]:
-        return []
+def get_default_compare_branch(
+    base_directory: str, branches: Container[str]
+) -> str | None:
+    return _get_mod(base_directory).get_default_compare_branch(branches)
+
+
+def remove_files(base_directory: str, fragment_filenames: list[str]) -> None:
+    return _get_mod(base_directory).remove_files(fragment_filenames)
+
+
+def stage_newsfile(directory: str, filename: str) -> None:
+    return _get_mod(directory).stage_newsfile(directory, filename)
+
+
+def get_remote_branches(base_directory: str) -> list[str]:
+    return _get_mod(base_directory).get_remote_branches(base_directory)
+
+
+def list_changed_files_compared_to_branch(
+    base_directory: str, compare_with: str, include_staged: bool
+) -> list[str]:
+    return _get_mod(base_directory).list_changed_files_compared_to_branch(
+        base_directory,
+        compare_with,
+        include_staged,
+    )

src/towncrier/build.py

@@ -278,7 +278,7 @@ def __main(
         answer_keep,
     ):
         click.echo("Removing news fragments...", err=to_err)
-        _vcs.remove_files(fragment_filenames)
+        _vcs.remove_files(base_directory, fragment_filenames)
 
     click.echo("Done!", err=to_err)
 

src/towncrier/check.py

@@ -12,12 +12,12 @@
 import click
 
 from ._builder import find_fragments
+from ._settings import config_option_help, load_config_from_options
 from ._vcs import (
+    get_default_compare_branch,
     get_remote_branches,
     list_changed_files_compared_to_branch,
-    get_default_compare_branch,
 )
-from ._settings import config_option_help, load_config_from_options
 
 
 @click.command(name="check")
@@ -71,7 +71,7 @@ def __main(
 
     if comparewith is None:
         comparewith = get_default_compare_branch(
-            get_remote_branches(base_directory=base_directory)
+            base_directory, get_remote_branches(base_directory=base_directory)
         )
 
     if comparewith is None: