pre-commit-vauxoo 8.3.22__tar.gz → 8.3.23__tar.gz

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 8.3.22
+current_version = 8.3.23
 commit = True
 tag = True
 sign_tags = True

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/ChangeLog

@@ -1,6 +1,14 @@
 CHANGES
 =======
 
+v8.3.23
+-------
+
+* Bump version: 8.3.22 → 8.3.23
+* [IMP] cfg: Update ruff-odoo to 0.16.3.35
+* [IMP] pre\_commit\_vauxoo: do not log every file of a "--files" list
+* [FIX] pre\_commit\_vauxoo: keep "--all" as the default scope
+
 v8.3.22
 -------
 

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pre-commit-vauxoo
-Version: 8.3.22
+Version: 8.3.23
 Summary: pre-commit script to run automatically the configuration and variables custom from Vauxoo
 Home-page: https://github.com/Vauxoo/pre-commit-vauxoo
 Author: Vauxoo
@@ -439,6 +439,14 @@ without touching the package's own ``.bumpversion.cfg``.
 CHANGES
 =======
 
+v8.3.23
+-------
+
+* Bump version: 8.3.22 → 8.3.23
+* [IMP] cfg: Update ruff-odoo to 0.16.3.35
+* [IMP] pre\_commit\_vauxoo: do not log every file of a "--files" list
+* [FIX] pre\_commit\_vauxoo: keep "--all" as the default scope
+
 v8.3.22
 -------
 

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/README.rst

@@ -50,9 +50,9 @@ Overview
     :alt: Supported versions
     :target: https://pypi.org/project/pre-commit-vauxoo
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/Vauxoo/pre-commit-vauxoo/v8.3.22.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/Vauxoo/pre-commit-vauxoo/v8.3.23.svg
     :alt: Commits since latest release
-    :target: https://github.com/Vauxoo/pre-commit-vauxoo/compare/v8.3.22...main
+    :target: https://github.com/Vauxoo/pre-commit-vauxoo/compare/v8.3.23...main
 
 
 

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/docs/conf.py

@@ -18,7 +18,7 @@ project = "pre-commit-vauxoo"
 year = "2022"
 author = "Vauxoo"
 copyright = f"{year}, {author}"
-version = release = "8.3.22"
+version = release = "8.3.23"
 
 pygments_style = "trac"
 templates_path = ["."]

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/setup.py

@@ -37,7 +37,7 @@ def read(*names, **kwargs):
 
 setup(
     name="pre-commit-vauxoo",
-    version="8.3.22",
+    version="8.3.23",
     license="LGPL-3.0-or-later",
     description="pre-commit script to run automatically the configuration and variables custom from Vauxoo",
     long_description_content_type="text/x-rst",

pre_commit_vauxoo-8.3.23/src/pre_commit_vauxoo/__init__.py

@@ -0,0 +1 @@
+__version__ = "8.3.23"

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/src/pre_commit_vauxoo/cfg/{% if use_ruff %}ruff{% endif %}/.pre-commit-config-autofix.yaml.jinja

@@ -32,7 +32,7 @@ default_language_version:
   node: "26.7.0"
 repos:
   - repo: https://github.com/Vauxoo/ruff-odoo-pre-commit
-    rev: 0.16.3.34{# b2v-ruff #}
+    rev: 0.16.3.35{# b2v-ruff #}
     hooks:
       - id: ruff-check
         name: ruff-odoo autofix checks

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/src/pre_commit_vauxoo/cfg/{% if use_ruff %}ruff{% endif %}/.pre-commit-config-optional.yaml.jinja

@@ -72,7 +72,7 @@ repos:
         pass_filenames: false
         always_run: true
   - repo: https://github.com/Vauxoo/ruff-odoo-pre-commit
-    rev: 0.16.3.34{# b2v-ruff #}
+    rev: 0.16.3.35{# b2v-ruff #}
     hooks:
       - id: ruff-check
         name: ruff-odoo optional checks
@@ -95,7 +95,7 @@ repos:
         args:
           - --config=.config/.flake8-optional
   - repo: https://github.com/Vauxoo/ruff-odoo-pre-commit
-    rev: 0.16.3.34{# b2v-ruff #}
+    rev: 0.16.3.35{# b2v-ruff #}
     hooks:
       - id: ruff-check
         name: ruff-odoo EXPERIMENTAL checks (Won't affect CI status)!

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/src/pre_commit_vauxoo/cfg/{% if use_ruff %}ruff{% endif %}/.pre-commit-config.yaml.jinja

@@ -28,7 +28,7 @@ default_language_version:
   node: "26.7.0"
 repos:
   - repo: https://github.com/Vauxoo/ruff-odoo-pre-commit
-    rev: 0.16.3.34{# b2v-ruff #}
+    rev: 0.16.3.35{# b2v-ruff #}
     hooks:
       - id: ruff-check
         name: ruff-odoo mandatory checks

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/src/pre_commit_vauxoo/pre_commit_vauxoo.py

@@ -59,6 +59,9 @@ BASE_REF_ENVVAR = "PRECOMMIT_BASE_REF"
 STABLE_REMOTE_NAME = "stb"
 STABLE_URL_NAMESPACE = "vauxoo/"
 
+# How many names of a "--files" list are printed when the command being run is logged
+LOGGED_FILES_LIMIT = 10
+
 # Commit message of "--autofixes-commit-by-module". "REF" is the tag for a change that
 # does not modify the expected behavior and the target is the module the autofixes
 # reformatted, both validated by the commit message check (see hooks/check_commit_msg.py)
@@ -679,9 +682,32 @@ def envfile2envdict(repo_dirname, source_file="variables.sh", no_overwrite_envir
     return envdict
 
 
+def format_command(command):
+    """The command as a string, with a long "--files" list collapsed
+
+    A scope covering many files turns the logged command into a wall of paths that
+    buries the rest of the output, so only the first ones are printed and the rest
+    counted
+    """
+    try:
+        first_file = command.index("--files") + 1
+    except ValueError:
+        return " ".join(command)
+    # The file names are not the last arguments ("-c <config>" is appended afterwards),
+    # so the list ends where the next option begins
+    last_file = first_file
+    while last_file < len(command) and not command[last_file].startswith("-"):
+        last_file += 1
+    hidden = last_file - first_file - LOGGED_FILES_LIMIT
+    if hidden <= 0:
+        return " ".join(command)
+    return " ".join(
+        command[: first_file + LOGGED_FILES_LIMIT] + ["... and %d more files" % hidden] + command[last_file:]
+    )
+
+
 def subprocess_call(command, *args, **kwargs):
-    cmd_str = " ".join(command)
-    _logger.debug("Running command: %s", cmd_str)
+    _logger.debug("Running command: %s", format_command(command))
     return subprocess.call(command, *args, **kwargs)
 
 
@@ -871,7 +897,7 @@ def run_autofix_hook(cmd, hook_id):
     # The hook is a positional argument of "pre-commit run", so it goes before the
     # options: "--files" would take it as one more file otherwise
     hook_cmd = cmd[:2] + [hook_id] + cmd[2:]
-    _logger.debug("Running command: %s", " ".join(hook_cmd))
+    _logger.debug("Running command: %s", format_command(hook_cmd))
     hook_run = subprocess.run(hook_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, check=False)
     output = hook_run.stdout.decode(sys.stdout.encoding, errors="replace")
     sys.stdout.write(output)
@@ -1098,14 +1124,11 @@ def main(  # ruff: ignore[complex-structure]
             included_files += get_files(included_path) or (included_path,)
         cmd.extend(["--files"] + included_files)
     else:
-        # The files are listed here instead of running "pre-commit run --all-files" since
-        # that resolves them with "git ls-files --deduplicate", an option added in git
-        # 2.31 that makes the whole run fail on an older git (e.g. Ubuntu 20.04 ships
-        # git 2.25) with: error: unknown option `deduplicate'
-        all_files = get_files(repo_dirname)
-        if not all_files:
-            raise UserWarning("Not files detected in repository %s" % repo_dirname)
-        cmd.extend(["--files"] + all_files)
+        # Checking the whole repository is what "--all-files" means, so it is left to
+        # pre-commit: it resolves the list itself and nothing has to be printed. Listing
+        # it here does not scale either, since every path travels on the command line:
+        # odoo/odoo alone is 49271 files, 2.3 MB of arguments against an ARG_MAX of 1 MB
+        cmd.append("--all")
     all_status = {}
 
     if "fix" in precommit_hooks_type:

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/src/pre_commit_vauxoo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pre-commit-vauxoo
-Version: 8.3.22
+Version: 8.3.23
 Summary: pre-commit script to run automatically the configuration and variables custom from Vauxoo
 Home-page: https://github.com/Vauxoo/pre-commit-vauxoo
 Author: Vauxoo
@@ -439,6 +439,14 @@ without touching the package's own ``.bumpversion.cfg``.
 CHANGES
 =======
 
+v8.3.23
+-------
+
+* Bump version: 8.3.22 → 8.3.23
+* [IMP] cfg: Update ruff-odoo to 0.16.3.35
+* [IMP] pre\_commit\_vauxoo: do not log every file of a "--files" list
+* [FIX] pre\_commit\_vauxoo: keep "--all" as the default scope
+
 v8.3.22
 -------
 

{pre_commit_vauxoo-8.3.22 → pre_commit_vauxoo-8.3.23}/tests/test_pre_commit_vauxoo.py

@@ -1259,11 +1259,6 @@ class TestPreCommitVauxoo:
         # "as_posix" is required since that windows separates the paths with "\"
         return sorted(Path(os.path.relpath(fname, self.tmp_dir)).as_posix() for fname in files)
 
-    def tracked_files(self):
-        """Files tracked by the repository, sorted and without duplicates"""
-        output = subprocess.check_output(["git", "ls-files"], cwd=self.tmp_dir).decode()
-        return sorted(set(output.splitlines()))
-
     def test_get_files_keeps_names_outside_ascii(self):
         """git quotes those names unless asked not to, and a quoted name does not exist
 
@@ -1281,30 +1276,12 @@ class TestPreCommitVauxoo:
         assert "module_example1/modulo_ñ.py" in files
         assert not [name for name in files if "\\" in name or name.startswith('"')]
 
-    def test_scope_default_is_all(self, monkeypatch):
-        """Running the command without a scope keeps checking the whole repository
-
-        The files are listed here instead of running "pre-commit run --all-files" since
-        that one resolves them with "git ls-files --deduplicate", an option only
-        available since git 2.31
-        """
-        self.git_commit_all()
-        self.write_file("module_example1/__init__.py")
-        result, run_commands = self.invoke_scope(monkeypatch, [])
-        assert not result.exit_code, "Exited with error %s - %s" % (result, result.output)
-        assert run_commands, "The hooks were not run"
-        for run_command in run_commands:
-            assert "--all" not in run_command, "'--all-files' needs a git newer than the one of Ubuntu 20.04"
-            assert self.scope_files(run_command) == self.tracked_files(), (
-                "The default scope is not checking the whole repository"
-            )
-
-    def test_scope_default_is_all_with_a_merge_conflict(self, monkeypatch):
-        """A file with a merge conflict is checked once, not once per stage of the index
+    def test_get_files_deduplicates_a_merge_conflict(self):
+        """A file with a merge conflict is listed once, not once per stage of the index
 
         "git ls-files" reports a conflicted path three times, one per stage of the index
-        (the common ancestor, "ours" and "theirs"), which is what the "--deduplicate"
-        option of git 2.31 suppresses
+        (the common ancestor, "ours" and "theirs"), so the hooks would be handed the very
+        same file three times
         """
         self.git_commit_all()
         conflicted = "module_example1/__init__.py"
@@ -1318,13 +1295,55 @@ class TestPreCommitVauxoo:
             self.git_call("merge", "-q", "conflicting")
         stages = subprocess.check_output(["git", "ls-files", "--", conflicted], cwd=self.tmp_dir).decode()
         assert stages.splitlines().count(conflicted) == 3, "The conflict did not duplicate the file in the index"
+
+        files = pre_commit_vauxoo.get_files(os.path.join(self.tmp_dir, "module_example1"))
+
+        assert files.count(conflicted) == 1, "The conflicted file is listed once per stage"
+
+    def test_format_command_collapses_the_files_list(self):
+        """The logged command counts the files it does not print
+
+        A scope can cover hundreds of files, which logs a wall of paths that buries the
+        rest of the output
+        """
+        files = ["module_example1/file%d.py" % index for index in range(25)]
+        command = ["pre-commit", "run", "--color=always", "--files"] + files + ["-c", ".pre-commit-config.yaml"]
+
+        logged = pre_commit_vauxoo.format_command(command)
+
+        assert logged.startswith("pre-commit run --color=always --files module_example1/file0.py ")
+        assert "module_example1/file9.py" in logged, "The first files are not printed"
+        assert "module_example1/file10.py" not in logged, "The whole list is printed"
+        assert "... and 15 more files" in logged, "The hidden files are not counted"
+        assert logged.endswith("-c .pre-commit-config.yaml"), "The options after the files are lost"
+
+    def test_format_command_keeps_a_short_files_list(self):
+        """A list that fits is printed whole: it is what says which files were checked"""
+        files = ["module_example1/file%d.py" % index for index in range(3)]
+        command = ["pre-commit", "run", "--files"] + files + ["-c", ".pre-commit-config.yaml"]
+
+        assert pre_commit_vauxoo.format_command(command) == " ".join(command)
+
+    def test_format_command_without_files(self):
+        """A command that sends no files is logged as it is run"""
+        command = ["git", "commit", "--no-verify", "-m", "[FIX] module_example1: something"]
+
+        assert pre_commit_vauxoo.format_command(command) == " ".join(command)
+
+    def test_scope_default_is_all(self, monkeypatch):
+        """Running the command without a scope delegates the whole repository to pre-commit
+
+        The file list belongs to the scope options only. Without one, "--all" is what is
+        sent, so nothing is printed and pre-commit resolves the files itself
+        """
+        self.git_commit_all()
+        self.write_file("module_example1/__init__.py")
         result, run_commands = self.invoke_scope(monkeypatch, [])
         assert not result.exit_code, "Exited with error %s - %s" % (result, result.output)
         assert run_commands, "The hooks were not run"
         for run_command in run_commands:
-            assert self.scope_files(run_command).count(conflicted) == 1, (
-                "The conflicted file is checked once per stage"
-            )
+            assert "--all" in run_command, "The default scope is not the whole repository"
+            assert self.scope_files(run_command) is None, "The default scope is listing the files"
 
     def test_scope_last_commit(self, monkeypatch):
         """'--last-commit' only checks the files of the last commit"""

pre_commit_vauxoo-8.3.22/src/pre_commit_vauxoo/__init__.py

@@ -1 +0,0 @@
-__version__ = "8.3.22"