omdev 0.0.0.dev269__py3-none-any.whl → 0.0.0.dev270__py3-none-any.whl

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/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/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/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/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/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.dist-info → omdev-0.0.0.dev270.dist-info}/METADATA

@@ -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.dist-info → omdev-0.0.0.dev270.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=hSEXKyag8MruNusPyIwNlvmQzOB4hSjjkSPbiiX0ufw,9833
+omdev/.manifests.json,sha256=Y0n59DYlvNfa1X0cqC5uuzEWvTGTPapn8IogdC_IuxY,10078
 omdev/__about__.py,sha256=zoyBmj0TF_W82x0PED8gLtrmcYTng6UePKZ_RGiQVGE,1214
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -32,12 +32,12 @@ omdev/cache/compute/resolvers.py,sha256=9dq0mt__emp8CdNDWPVUr_dCkTOn7ar6nw0F2QH6
 omdev/cache/compute/storage.py,sha256=woCUqHg8ZrwLEejRG3zu1L5ZXxGNNXveh3E8FnlEkjc,941
 omdev/cache/compute/types.py,sha256=NpCTTJHDmpERjrbO6dh9TEzHuP6-vOuoX3ym9sA0ukc,2639
 omdev/cache/data/__init__.py,sha256=SQXtugLceRif463rcoklpQ33pxYLgEIm0xiI6NvOI6M,301
-omdev/cache/data/actions.py,sha256=KVYb3tBYP5c0g-wK1bXih_K7L0ER9UINKChhfc7mwKQ,1071
+omdev/cache/data/actions.py,sha256=Mv7eXeZuohCjQLpmLyvqvGjjBacXIvTYzIRMVpEh-zM,1037
 omdev/cache/data/cache.py,sha256=aZJotj9kpVHBK7O0UdqMdeV7PtCqf9Rd8tqIwgWtQlQ,7664
 omdev/cache/data/consts.py,sha256=d6W_aeMqgah6PmPYi9RA8Be54oQ4BcNCy8kDQ7FlB_Q,26
 omdev/cache/data/defaults.py,sha256=NL_mT7kaSLm2Mk9VO5wdSu-DIcHTR1KgcihJqdSd4TY,312
 omdev/cache/data/manifests.py,sha256=4BparztsMZo9DDVVPhv6iv5g4kK7QAi8Vqtj3PbKkco,989
-omdev/cache/data/specs.py,sha256=8o0b7goqvnezB_lD46w4ySp2KMZ8In3nqbtmfUT7v6c,2504
+omdev/cache/data/specs.py,sha256=u082monskfaHeJlDXOAXjyvgRfqrnbVXrFLMJoOHWqI,2470
 omdev/cc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cc/__main__.py,sha256=n7gxSRYZ1QZOUxQPCT0_n9Xl26zi2UIvCwyGW_m67nA,166
 omdev/cc/cdeps.py,sha256=vU0_O822uG8KK2lizuY71YczH9N9KB2JdI492JnGGQ0,1552
@@ -178,7 +178,7 @@ omdev/oci/pack/packing.py,sha256=K00GKBPGYYzFEK0CuQvoI7XRLULNld7_i7XcKdQ35zk,541
 omdev/oci/pack/repositories.py,sha256=EwCJlngKjqpNgcEeszOOnj3WxlQTgLOKo_rwe2PW8JM,4948
 omdev/oci/pack/unpacking.py,sha256=gRwdhYNpLc2QHq2JndRx5unrSCtcaYUUZZyCTCsDIHo,5997
 omdev/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/packaging/marshal.py,sha256=c4Mdy5-s4O51eEKMWWBwkhTGQ1FoxVI2lD6CxI_cF3k,2379
+omdev/packaging/marshal.py,sha256=YMXXkoWkjYoOAyD6RHsmaHGwlIsDQjnMtfa6e9-l4_A,2348
 omdev/packaging/names.py,sha256=-a7AykFPVR1i6EYJepbe3ABRrZQ_tPPmK5olzbn9HLI,2528
 omdev/packaging/requires.py,sha256=PGbH1m17lkFEBvSp3znF-o9dmgFrRCM_PHBl0ARa6lw,15679
 omdev/packaging/revisions.py,sha256=3u-6vY0mq01tgRENcncozsMLXSgtaQWXuQp0kRkEHvg,4986
@@ -224,6 +224,7 @@ omdev/tokens/tokenizert.py,sha256=-KM5ajybESWCMtqxSm_5ktyu8s-p1MdTgYA4ungyrkM,78
 omdev/tokens/utils.py,sha256=DJA2jsDzrtQxnO0bdkUk1-GmenX4ECugdhl1xOBe7QI,1448
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/cloc.py,sha256=jYlMHBae9oGKN4VKeBGuqjiQNcM2be7KIoTF0oNwx_I,5205
+omdev/tools/diff.py,sha256=_ThKWXFE-bG5SPDYNs8GqstEUPzL_PTWb03nJN0laLg,515
 omdev/tools/doc.py,sha256=wvgGhv6aFaV-Zl-Qivejx37i-lKQ207rZ-4K2fPf-Ss,2547
 omdev/tools/docker.py,sha256=Ekn8q0vo5KZPnz5Fz2P_NDeZkN3c2bdnMvh0SOLWNps,7184
 omdev/tools/importscan.py,sha256=nhJIhtjDY6eFVlReP7fegvv6L5ZjN-Z2VeyhsBonev4,4639
@@ -239,7 +240,7 @@ omdev/tools/shadow.py,sha256=e0-R3Ss9CaZbGSUzSSr29OVj9mUQ-Oelh-66Dfkx5nk,1600
 omdev/tools/sqlrepl.py,sha256=wAjrfXNrRV63-NJCC2HlGQnFh7lUH0bHMnOjYotQqFs,5753
 omdev/tools/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,168
-omdev/tools/git/cli.py,sha256=E6v1dHjKiZpFRIRcJigajpXOnlRia-AUZQlwxaXqvgA,14179
+omdev/tools/git/cli.py,sha256=HOQX9VDvlzHrsoC8Jh-sVBBPP1IZit-Us0s_imkbuNc,14484
 omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
 omdev/tools/git/messages.py,sha256=NWztIK0nAKJIOVzuVQcR_5LHZUgqyVkrOlpl7dFLMdU,2424
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -253,9 +254,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev269.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev269.dist-info/METADATA,sha256=AqDahcQlEANe8r3cGhe2SVIQ97W8LuvioG1A1bKaQlI,1658
-omdev-0.0.0.dev269.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omdev-0.0.0.dev269.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev269.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev269.dist-info/RECORD,,
+omdev-0.0.0.dev270.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev270.dist-info/METADATA,sha256=CNXzecygSkb865NgkyFDJcW3wruEQ9XsiSh664aIhLk,1658
+omdev-0.0.0.dev270.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omdev-0.0.0.dev270.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev270.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev270.dist-info/RECORD,,