omdev 0.0.0.dev495__tar.gz → 0.0.0.dev497__tar.gz

{omdev-0.0.0.dev495/omdev.egg-info → omdev-0.0.0.dev497}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev495
+Version: 0.0.0.dev497
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev495
+Requires-Dist: omlish==0.0.0.dev497
 Provides-Extra: all
 Requires-Dist: black~=25.12; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev495 → omdev-0.0.0.dev497}/omdev/pyproject/pkg.py

@@ -587,7 +587,7 @@ class _PyprojectRsPackageGenerator(_PyprojectExtensionPackageGenerator):
             # `sdist.add_defaults` as an unbound function, not a bound method:
             # https://github.com/pypa/setuptools/blob/9c4d383631d3951fcae0afd73b5d08ff5a262976/setuptools/command/egg_info.py#L581
             from setuptools.command.sdist import sdist  # noqa
-            sdist.add_defaults = (lambda old: lambda sdist: _sdist_add_defaults(old, sdist))(sdist.add_defaults)  # noqa
+            setattr(sdist, 'add_defaults', (lambda old: lambda sdist: _sdist_add_defaults(old, sdist))(sdist.add_defaults))  # noqa
 
         _patch_sdist()
 

{omdev-0.0.0.dev495 → omdev-0.0.0.dev497}/omdev/scripts/pyproject.py

@@ -146,7 +146,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../interp/providers/system.py', sha1='9638a154475ca98775159d27739563ac7fb2eb16'),
             dict(path='../interp/pyenv/install.py', sha1='4a10a19717364b4ba9f3b8bf1d12621cf21ba8b8'),
             dict(path='../interp/uv/provider.py', sha1='3c3980878ad2b9fd2cd02172f9424954759c7f06'),
-            dict(path='pkg.py', sha1='a7b64fcf267ba385442393b90c9711af08ba9ac3'),
+            dict(path='pkg.py', sha1='e2acb40b17d75b6deb78056e6726d114a7aef2e4'),
             dict(path='../interp/providers/inject.py', sha1='7cc9ebf58cf2ec09545321456bd9da9f9a3a79fb'),
             dict(path='../interp/pyenv/provider.py', sha1='377542ce01a35849e2a5b4a4dbafedc26882f983'),
             dict(path='../interp/uv/inject.py', sha1='e95d058c2340baa5a3155ec3440f311d1daa10a8'),
@@ -11843,7 +11843,7 @@ class _PyprojectRsPackageGenerator(_PyprojectExtensionPackageGenerator):
             # `sdist.add_defaults` as an unbound function, not a bound method:
             # https://github.com/pypa/setuptools/blob/9c4d383631d3951fcae0afd73b5d08ff5a262976/setuptools/command/egg_info.py#L581
             from setuptools.command.sdist import sdist  # noqa
-            sdist.add_defaults = (lambda old: lambda sdist: _sdist_add_defaults(old, sdist))(sdist.add_defaults)  # noqa
+            setattr(sdist, 'add_defaults', (lambda old: lambda sdist: _sdist_add_defaults(old, sdist))(sdist.add_defaults))  # noqa
 
         _patch_sdist()
 

{omdev-0.0.0.dev495 → omdev-0.0.0.dev497}/omdev/tools/git/cli.py

@@ -90,7 +90,12 @@ def get_first_commit_of_day(rev: str) -> str | None:
 class Cli(ap.Cli):
     @dc.dataclass(frozen=True, kw_only=True)
     class Config:
-        default_message_generator: str | None = None
+        @dc.dataclass(frozen=True, kw_only=True)
+        class MessageGenerator:
+            name: str
+            config: ta.Mapping[str, ta.Any] | None = None
+
+        message_generator: str | MessageGenerator | None = None
 
     _config_file_path_arg: ta.Optional[str] = ap.arg_('-c', '--config-file-path', nargs='?')
 
@@ -280,6 +285,35 @@ class Cli(ap.Cli):
 
     # Lazy helpers
 
+    def _make_git_message_generator(
+            self,
+            *,
+            name: str | None = None,
+            cwd: str | None = None,
+    ) -> GitMessageGenerator:
+        cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
+        kw: dict[str, ta.Any] = {}
+
+        if name is None:
+            if cwd is None:
+                cwd = os.getcwd()
+
+            cfg = self.load_config(cwd).message_generator
+            if cfg is None:
+                pass
+            elif isinstance(cfg, str):
+                name = cfg
+            elif isinstance(cfg, Cli.Config.MessageGenerator):
+                name = cfg.name
+                kw.update(cfg.config or {})
+            else:
+                raise TypeError(cfg)
+
+        if name is not None:
+            cls = load_message_generator_manifests_map()[name].load_cls()
+
+        return cls(**kw)
+
     @ap.cmd(
         ap.arg('-g', '--message-generator', nargs='?'),
         ap.arg('dir', nargs='*'),
@@ -292,12 +326,10 @@ class Cli(ap.Cli):
             if not (st.has_staged or st.has_dirty):
                 return
 
-            mg_cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
-            if (mg_name := self.args.message_generator) is None:
-                mg_name = self.load_config(cwd).default_message_generator
-            if mg_name is not None:
-                mg_cls = load_message_generator_manifests_map()[mg_name].load_cls()
-            mg = mg_cls()
+            mg = self._make_git_message_generator(
+                name=self.args.message_generator,
+                cwd=cwd,
+            )
 
             mgr = mg.generate_commit_message(GitMessageGenerator.GenerateCommitMessageArgs(
                 cwd=cwd,
@@ -338,12 +370,10 @@ class Cli(ap.Cli):
                     msg = self.args.message
 
                 else:
-                    mg_cls: type[GitMessageGenerator] = TimestampGitMessageGenerator
-                    if (mg_name := self.args.message_generator) is None:
-                        mg_name = self.load_config(cwd).default_message_generator
-                    if mg_name is not None:
-                        mg_cls = load_message_generator_manifests_map()[mg_name].load_cls()
-                    mg = mg_cls()
+                    mg = self._make_git_message_generator(
+                        name=self.args.message_generator,
+                        cwd=cwd,
+                    )
 
                     mgr = mg.generate_commit_message(GitMessageGenerator.GenerateCommitMessageArgs(
                         cwd=cwd,

{omdev-0.0.0.dev495 → omdev-0.0.0.dev497/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev495
+Version: 0.0.0.dev497
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev495
+Requires-Dist: omlish==0.0.0.dev497
 Provides-Extra: all
 Requires-Dist: black~=25.12; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"

{omdev-0.0.0.dev495 → omdev-0.0.0.dev497}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev495
+omlish==0.0.0.dev497
 
 [all]
 black~=25.12

{omdev-0.0.0.dev495 → omdev-0.0.0.dev497}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev495'
+version = '0.0.0.dev497'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev495',
+    'omlish == 0.0.0.dev497',
 ]
 
 [project.optional-dependencies]