[IMP] Add patches directly in repos.yaml

Appling it without extra command in shell_command_after

Author: mt-software-de

git_aggregator/config.py

@@ -1,4 +1,5 @@
 # © 2015 ACSONE SA/NV
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPLv3 (http://www.gnu.org/licenses/agpl-3.0-standalone.html)
 
 import logging
@@ -9,10 +10,21 @@
 
 from ._compat import string_types
 from .exception import ConfigException
+from .patch import Patches
 
 log = logging.getLogger(__name__)
 
 
+def update_patches(repo_dict, repo_data):
+    """Check and update repo_dict with patch files"""
+    patches_data = repo_data.get("patches")
+    patches = repo_dict.setdefault("patches", Patches())
+    if not patches_data:
+        return
+    for patch in patches_data:
+        patches += Patches.prepare_patches(patch, repo_dict.get("cwd"))
+
+
 def get_repos(config, force=False):
     """Return a :py:obj:`list` list of repos from config file.
     :param config: the repos config in :py:class:`dict` format.
@@ -126,6 +138,7 @@ def get_repos(config, force=False):
                     cmds = [cmds]
                 commands = cmds
         repo_dict['shell_command_after'] = commands
+        update_patches(repo_dict, repo_data)
         repo_list.append(repo_dict)
     return repo_list
 

git_aggregator/patch.py

@@ -0,0 +1,66 @@
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
+# License AGPLv3 (http://www.gnu.org/licenses/agpl-3.0-standalone.html)
+import logging
+import subprocess
+from pathlib import Path
+
+from .command import CommandExecutor
+
+logger = logging.getLogger(__name__)
+
+
+class Patch(CommandExecutor):
+    is_local = False
+
+    def __init__(self, path, cwd):
+        super().__init__(cwd)
+        self.path = path
+        path = Path(path)
+        if path.exists():
+            self.is_local = True
+
+    def retrive_data(self):
+        path = self.path
+        if self.is_local:
+            patch_path = Path(path).absolute()
+            path = f"FILE:{str(patch_path)}"
+        cmd = [
+            "curl",
+            path,
+        ]
+        if logger.getEffectiveLevel() != logging.DEBUG:
+            cmd.append('-s')
+        return self.log_call(
+            cmd,
+            callwith=subprocess.Popen,
+            stdout=subprocess.PIPE
+        )
+
+    def apply(self):
+        res = self.retrive_data()
+        cmd = [
+            "git",
+            "am",
+        ]
+        if logger.getEffectiveLevel() != logging.DEBUG:
+            cmd.append('--quiet')
+        self.log_call(cmd, cwd=self.cwd, stdin=res.stdout)
+
+
+class Patches(list):
+    """List of patches"""
+    @staticmethod
+    def prepare_patches(path, cwd):
+        _path = Path(path)
+        patches = Patches()
+        if not _path.exists() or _path.is_file():
+            patches.append(Patch(path, cwd))
+        elif _path.is_dir():
+            for fpath in _path.iterdir():
+                if fpath.is_file():
+                    patches.append(Patch(str(fpath), cwd))
+        return patches
+
+    def apply(self):
+        for patch in self:
+            patch.apply()

git_aggregator/repo.py

@@ -1,4 +1,5 @@
 # © 2015 ACSONE SA/NV
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPLv3 (http://www.gnu.org/licenses/agpl-3.0-standalone.html)
 # Parts of the code comes from ANYBOX
 # https://github.com/anybox/anybox.recipe.odoo
@@ -37,7 +38,7 @@ class Repo(CommandExecutor):
 
     def __init__(self, cwd, remotes, merges, target,
                  shell_command_after=None, fetch_all=False, defaults=None,
-                 force=False):
+                 force=False, patches=None):
         """Initialize a git repository aggregator
 
         :param cwd: path to the directory where to initialize the repository
@@ -68,6 +69,7 @@ def __init__(self, cwd, remotes, merges, target,
         self.shell_command_after = shell_command_after or []
         self.defaults = defaults or dict()
         self.force = force
+        self.patches = patches
 
     @property
     def git_version(self):
@@ -173,6 +175,7 @@ def aggregate(self):
             self._reset_to(origin["remote"], origin["ref"])
         for merge in merges:
             self._merge(merge)
+        self.patches.apply()
         self._execute_shell_command_after()
         logger.info('End aggregation of %s', self.cwd)
 

tests/test_config.py

@@ -1,4 +1,5 @@
 # © 2015 ACSONE SA/NV
+# Copyright 2025 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPLv3 (http://www.gnu.org/licenses/agpl-3.0-standalone.html)
 import os
 import tempfile
@@ -44,6 +45,7 @@ def test_load(self):
              'merges': [{'ref': '8.0', 'remote': 'oca'},
                         {'ref': 'refs/pull/105/head', 'remote': 'oca'},
                         {'ref': 'refs/pull/106/head', 'remote': 'oca'}],
+             'patches': [],
              'remotes': [],
              'shell_command_after': [],
              'target': {'branch': 'aggregated_branch_name',
@@ -91,6 +93,7 @@ def test_load_defaults(self):
              'merges': [{'ref': '8.0', 'remote': 'oca', 'depth': 1000},
                         {'ref': 'refs/pull/105/head', 'remote': 'oca'},
                         {'ref': 'refs/pull/106/head', 'remote': 'oca'}],
+             'patches': [],
              'remotes': [],
              'shell_command_after': [],
              'target': {'branch': 'aggregated_branch_name',