omdev 0.0.0.dev269__tar.gz → 0.0.0.dev270__tar.gz

{omdev-0.0.0.dev269/omdev.egg-info → omdev-0.0.0.dev270}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev269
+Version: 0.0.0.dev270
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev269
+Requires-Dist: omlish==0.0.0.dev270
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270}/omdev/.manifests.json

@@ -239,6 +239,18 @@
       }
     }
   },
+  {
+    "module": ".tools.diff",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/diff.py",
+    "line": 21,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "diff",
+        "mod_name": "omdev.tools.diff"
+      }
+    }
+  },
   {
     "module": ".tools.doc",
     "attr": "_CLI_MODULE",

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270}/omdev/cache/data/actions.py

@@ -41,5 +41,7 @@ class ExtractAction(Action, lang.Final):
 @lang.static_init
 def _install_standard_marshalling() -> None:
     actions_poly = msh.polymorphism_from_subclasses(Action, naming=msh.Naming.SNAKE, strip_suffix=True)
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(actions_poly)]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(actions_poly)]
+    msh.install_standard_factories(
+        msh.PolymorphismMarshalerFactory(actions_poly),
+        msh.PolymorphismUnmarshalerFactory(actions_poly),
+    )

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270}/omdev/cache/data/specs.py

@@ -95,5 +95,7 @@ class GithubContentSpec(Spec):
 @lang.static_init
 def _install_standard_marshalling() -> None:
     specs_poly = msh.polymorphism_from_subclasses(Spec, naming=msh.Naming.SNAKE, strip_suffix=True)
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(specs_poly)]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(specs_poly)]
+    msh.install_standard_factories(
+        msh.PolymorphismMarshalerFactory(specs_poly),
+        msh.PolymorphismUnmarshalerFactory(specs_poly),
+    )

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270}/omdev/packaging/marshal.py

@@ -65,17 +65,17 @@ def _install_standard_marshalling() -> None:
             msh.Impl(RequiresOp, 'op'),
         ],
     )
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [
+    msh.install_standard_factories(
         msh.PolymorphismMarshalerFactory(requires_node_poly),
+        msh.PolymorphismUnmarshalerFactory(requires_node_poly),
         msh.PolymorphismUnionMarshalerFactory(requires_node_poly.impls, allow_partial=True),
-        RequiresMarkerListMarshalerFactory(),
+    )
 
-    ]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [
-        msh.PolymorphismUnmarshalerFactory(requires_node_poly),
-    ]
+    msh.install_standard_factories(
+        RequiresMarkerListMarshalerFactory(),
+    )
 
-    msh.GLOBAL_REGISTRY.register(
+    msh.register_global(
         RequiresMarkerList,
         msh.ReflectOverride(MarshalRequiresMarkerList),
         identity=True,

omdev-0.0.0.dev270/omdev/tools/diff.py

@@ -0,0 +1,26 @@
+import shlex
+
+from omlish.argparse import all as ap
+from omlish.subprocesses.sync import subprocesses
+
+from ..cli import CliModule
+
+
+class Cli(ap.Cli):
+    @ap.cmd(
+        ap.arg('l'),
+        ap.arg('r'),
+    )
+    def less(self) -> None:
+        subprocesses.check_call(
+            f'diff --color=always -y {shlex.quote(self.args.l)} {shlex.quote(self.args.r)} | less -R',
+            shell=True,
+        )
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('diff', __name__)
+
+
+if __name__ == '__main__':
+    Cli()()

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270}/omdev/tools/git/cli.py

@@ -23,6 +23,7 @@ import dataclasses as dc
 import logging
 import os
 import re
+import sys
 import typing as ta
 import urllib.parse
 
@@ -374,6 +375,7 @@ class Cli(ap.Cli):
 
     @ap.cmd(
         ap.arg('dir', nargs='*'),
+        ap.arg('-x', '--on-error-resume-next', action='store_true'),
         aliases=['usb'],
     )
     def update_submodule_branches(self) -> None:
@@ -406,7 +408,13 @@ class Cli(ap.Cli):
             ).decode().strip().splitlines()
 
             for submodule in submodules:
-                run_submodule(submodule, cwd)
+                try:
+                    run_submodule(submodule, cwd)
+                except Exception as e:
+                    if self.args.on_error_resume_next:
+                        print(e, file=sys.stderr)
+                    else:
+                        raise
 
         if not self.args.dir:
             run(None)

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev269
+Version: 0.0.0.dev270
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev269
+Requires-Dist: omlish==0.0.0.dev270
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270}/omdev.egg-info/SOURCES.txt

@@ -234,6 +234,7 @@ omdev/tokens/tokenizert.py
 omdev/tokens/utils.py
 omdev/tools/__init__.py
 omdev/tools/cloc.py
+omdev/tools/diff.py
 omdev/tools/doc.py
 omdev/tools/docker.py
 omdev/tools/importscan.py

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev269
+omlish==0.0.0.dev270
 
 [all]
 black~=25.1

{omdev-0.0.0.dev269 → omdev-0.0.0.dev270}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev269'
+version = '0.0.0.dev270'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev269',
+    'omlish == 0.0.0.dev270',
 ]
 
 [project.optional-dependencies]