Avoid direct config access from git operations

comma/cli/__init__.py

@@ -34,12 +34,12 @@ def run(options):
                 session.add_all(config.default_monitoring_subjects)
 
     if options.print_tracked_paths:
-        for path in get_linux_repo().get_tracked_paths():
+        for path in get_linux_repo(since=config.since).get_tracked_paths(config.sections):
             print(path)
 
     if options.upstream:
         LOGGER.info("Begin monitoring upstream")
-        process_commits(add_to_database=True)
+        process_commits(add_to_database=True, since=config.since)
         LOGGER.info("Finishing monitoring upstream")
 
     if options.downstream:

comma/downstream/__init__.py

@@ -36,7 +36,7 @@ class Downstream:
         """
         Get repo when first accessed
         """
-        return get_linux_repo()
+        return get_linux_repo(since=self.config.since)
 
     def list_targets(
         self,
@@ -116,7 +116,9 @@ class Downstream:
                     remote_ref,
                     subject.distroID,
                 )
-                repo.fetch_remote_ref(subject.distroID, local_ref, remote_ref)
+                repo.fetch_remote_ref(
+                    subject.distroID, local_ref, remote_ref, since=self.config.since
+                )
 
                 LOGGER.info(
                     "(%d of %d) Monitoring Script starting for distro: %s, revision: %s",
@@ -135,7 +137,9 @@ class Downstream:
         reference: Git reference to monitor
         """
 
-        missing_cherries = self.repo.get_missing_cherries(reference, self.repo.get_tracked_paths())
+        missing_cherries = self.repo.get_missing_cherries(
+            reference, self.repo.get_tracked_paths(self.config.sections), since=self.config.since
+        )
         LOGGER.debug("Found %d missing patches through cherry-pick.", len(missing_cherries))
 
         # Run extra checks on these missing commits

comma/upstream.py

@@ -93,8 +93,8 @@ def process_commits(
     since: if provided, will only process commits after this commit
     """
 
-    repo = get_linux_repo()
-    paths = repo.get_tracked_paths()
+    repo = get_linux_repo(since=since)
+    paths = repo.get_tracked_paths(config.sections)
 
     if commit_ids is None:
         # We use `--min-parents=1 --max-parents=1` to avoid both merges and graft commits.

comma/util/spreadsheet.py

@@ -20,7 +20,7 @@ from openpyxl.worksheet.worksheet import Worksheet
 
 from comma.database.driver import DatabaseDriver
 from comma.database.model import Distros, MonitoringSubjects, PatchData
-from comma.util import tracking
+from comma.util import config, tracking
 
 
 LOGGER = logging.getLogger(__name__)
@@ -171,7 +171,7 @@ def export_commits(in_file: str, out_file: str) -> None:
     # Collect the commits in the database which are not in the
     # workbook, but that we want to include.
     db_commits = get_db_commits()
-    repo = tracking.get_linux_repo()
+    repo = tracking.get_linux_repo(since=config.since)
     tag = "v4.15"
     if tag in repo.references:
         LOGGER.info("Skipping commits before tag '%s'!", tag)

comma/util/symbols.py

@@ -10,6 +10,7 @@ from pathlib import Path
 
 from comma.database.driver import DatabaseDriver
 from comma.database.model import PatchData
+from comma.util import config
 from comma.util.tracking import get_linux_repo
 
 
@@ -93,7 +94,7 @@ def get_hyperv_patch_symbols():
     This function clones upstream and gets upstream commits, hyperV files
     """
 
-    repo = get_linux_repo(name="linux-sym", shallow=False, pull=True)
+    repo = get_linux_repo(name="linux-sym", pull=True)
 
     with DatabaseDriver.get_session() as session:
         # SQLAlchemy returns tuples which need to be unwrapped
@@ -103,7 +104,7 @@ def get_hyperv_patch_symbols():
                 commit[0]
                 for commit in session.query(PatchData.commitID).order_by(PatchData.commitTime).all()
             ],
-            repo.get_tracked_paths(),
+            repo.get_tracked_paths(config.sections),
         )
 
 

comma/util/tracking.py

@@ -12,8 +12,6 @@ from typing import Any, Iterable, List, Optional, Set, Tuple
 import approxidate
 import git
 
-from comma.util import config
-
 
 LOGGER = logging.getLogger(__name__)
 
@@ -49,20 +47,22 @@ class Repo:
     def __getattr__(self, name: str) -> Any:
         return getattr(self.obj, name)
 
-    def fetch(self, repack: bool = False):
+    def fetch(self, since: Optional[str] = None, repack: bool = False):
         """Fetch repo"""
 
         if repack:
             LOGGER.info("Repacking '%s' repo", self.name)
             self.obj.git.repack("-d")
 
-        LOGGER.info("Fetching '%s' repo since %s", self.name, config.since)
+        if since:
+            LOGGER.info("Fetching '%s' repo since %s", self.name, since)
+            kwargs = {"shallow_since": since}
+        else:
+            LOGGER.info("Fetching '%s' repo", self.name)
+            kwargs = {}
+
         try:
-            self.obj.remotes.origin.fetch(
-                shallow_since=config.since,
-                verbose=True,
-                progress=GitProgressPrinter(),
-            )
+            self.obj.remotes.origin.fetch(verbose=True, progress=GitProgressPrinter(), **kwargs)
             LOGGER.info("Completed fetching %s", self.name)
         except git.GitCommandError as e:
             # Sometimes a shallow-fetched repo will need repacking before fetching again
@@ -72,11 +72,11 @@ class Repo:
             else:
                 raise
 
-    def clone(self, shallow: bool = True):
+    def clone(self, since: Optional[str] = None):
         """Clone repo"""
 
         LOGGER.info("Cloning '%s' repo from '%s'.", self.name, self.url)
-        args = {"shallow_since": config.since} if shallow else {}
+        args = {"shallow_since": since} if since else {}
         self.obj = git.Repo.clone_from(self.url, self.path, **args, progress=GitProgressPrinter())
         LOGGER.info("Completed cloning %s", self.name)
 
@@ -91,7 +91,7 @@ class Repo:
         """Convenience property to see if repo abject has been populated"""
         return self.obj is not None
 
-    def get_tracked_paths(self, sections=config.sections) -> Tuple[str]:
+    def get_tracked_paths(self, sections) -> Tuple[str]:
         """Get list of files from MAINTAINERS for given sections."""
 
         if self._tracked_paths is not None:
@@ -116,13 +116,21 @@ class Repo:
 
         return self._tracked_paths
 
-    def fetch_remote_ref(self, remote: str, local_ref: str, remote_ref: str) -> None:
+    def fetch_remote_ref(
+        self, remote: str, local_ref: str, remote_ref: str, since: Optional[str] = None
+    ) -> None:
         """
         Shallow fetch remote reference so it is available locally
         """
 
         remote = self.obj.remote(remote)
 
+        # No fetch window specified
+        if not since:
+            LOGGER.info("Fetching ref %s from remote %s", remote_ref, remote)
+            remote.fetch(remote_ref, verbose=True, progress=GitProgressPrinter())
+            return
+
         # Initially fetch revision at depth 1
         LOGGER.info("Fetching remote ref %s from remote %s at depth 1", remote_ref, remote)
         fetch_info = remote.fetch(remote_ref, depth=1, verbose=True, progress=GitProgressPrinter())
@@ -130,17 +138,17 @@ class Repo:
         # If last commit for revision is in the fetch window, expand depth
         # This check is necessary because some servers will throw an error when there are
         # no commits in the fetch window
-        if fetch_info[-1].commit.committed_date >= approxidate.approx(config.since):
+        if fetch_info[-1].commit.committed_date >= approxidate.approx(since):
             LOGGER.info(
                 'Fetching ref %s from remote %s shallow since "%s"',
                 remote_ref,
                 remote,
-                config.since,
+                since,
             )
             try:
                 remote.fetch(
                     remote_ref,
-                    shallow_since=config.since,
+                    shallow_since=since,
                     verbose=True,
                     progress=GitProgressPrinter(),
                 )
@@ -158,14 +166,14 @@ class Repo:
                 'Newest commit for ref %s from remote %s is older than fetch window "%s"',
                 remote_ref,
                 remote,
-                config.since,
+                since,
             )
 
         # Create tag at FETCH_HEAD to preserve reference locally
         if not hasattr(self.obj.references, local_ref):
             self.obj.create_tag(local_ref, "FETCH_HEAD")
 
-    def get_missing_cherries(self, reference, paths):
+    def get_missing_cherries(self, reference, paths, since: Optional[str] = None):
         """
         Get a list of cherry-picked commits missing from the downstream reference
         """
@@ -175,7 +183,7 @@ class Repo:
             self.obj.git.log(
                 "--no-merges",
                 "--pretty=format:%H",
-                f"--since={config.since}",
+                f"--since={since}",
                 "origin/master",
                 "--",
                 paths,
@@ -189,7 +197,7 @@ class Repo:
                 "--right-only",
                 "--cherry-pick",
                 "--pretty=format:%H",
-                f"--since={config.since}",
+                f"--since={since}",
                 f"{reference}...origin/master",
             ).splitlines()
         )
@@ -229,7 +237,7 @@ class Session:
         self,
         name: str,
         url: str,
-        shallow: bool = True,
+        since: Optional[str] = None,
         pull: bool = False,
     ) -> Repo:
         """
@@ -245,12 +253,12 @@ class Session:
         repo = self.repos[name] = Repo(name, url)
         if not repo.exists:
             # No local repo, clone from source
-            repo.clone(shallow)
+            repo.clone(since)
 
         elif pull:
             repo.pull()
         else:
-            repo.fetch()
+            repo.fetch(since)
 
         return repo
 
@@ -262,14 +270,14 @@ SESSION = Session()
 def get_linux_repo(
     name: str = "linux.git",
     url: str = "https://github.com/torvalds/linux.git",
-    shallow: bool = True,
+    since: Optional[str] = None,
     pull: bool = False,
 ) -> Repo:
     """
     Shortcut for getting Linux repo
     """
 
-    return SESSION.get_repo(name, url, shallow=shallow, pull=pull)
+    return SESSION.get_repo(name, url, since=since, pull=pull)
 
 
 def extract_paths(sections: Iterable, content: str) -> Set[str]:
@@ -330,7 +338,7 @@ class GitProgressPrinter(git.RemoteProgress):
         """
         Subclassed from parent. Called for each line in output.
         """
-        if not config.verbose:
+        if not LOGGER.isEnabledFor(logging.INFO):
             return
 
         print(f"  {self._cur_line}", end="    ")