omdev 0.0.0.dev158__py3-none-any.whl → 0.0.0.dev160__py3-none-any.whl

omdev/amalg/amalg.py

@@ -41,7 +41,7 @@ import tokenize_rt as trt
 from omlish import check
 from omlish import collections as col
 from omlish import lang
-from omlish.lite.runtime import REQUIRED_PYTHON_VERSION
+from omlish.lite.runtime import LITE_REQUIRED_PYTHON_VERSION
 from omlish.logs import all as logs
 
 from .. import magic
@@ -595,11 +595,11 @@ def gen_amalg(
     out.write('\n\n')
 
     version_check_fail_msg = (
-        f'Requires python {REQUIRED_PYTHON_VERSION!r}, '
+        f'Requires python {LITE_REQUIRED_PYTHON_VERSION!r}, '
         f'got {{sys.version_info}} from {{sys.executable}}'
     )
     out.write(textwrap.dedent(f"""
-    if sys.version_info < {REQUIRED_PYTHON_VERSION!r}:
+    if sys.version_info < {LITE_REQUIRED_PYTHON_VERSION!r}:
         raise OSError(f{version_check_fail_msg!r})  # noqa
     """).lstrip())
     out.write('\n\n')

omdev/cache/data/cache.py

@@ -27,7 +27,7 @@ from omlish import marshal as msh
 from omlish.formats import json
 from omlish.os.files import touch
 
-from ... import git
+from ...git.subtrees import git_clone_subtree
 from .actions import Action
 from .actions import ExtractAction
 from .manifests import Manifest
@@ -148,7 +148,7 @@ class Cache:
 
             log.info('Cloning git repo: %s -> %s', spec.url, tmp_dir)
 
-            git.git_clone_subtree(
+            git_clone_subtree(
                 base_dir=tmp_dir,
                 repo_url=spec.url,
                 repo_dir='data',

omdev/cache/data/manifests.py

@@ -4,7 +4,7 @@ from omlish import __about__ as about
 from omlish import cached
 from omlish import dataclasses as dc
 
-from ...git import get_git_revision
+from ...git.revisions import get_git_revision
 from .consts import SERIALIZATION_VERSION
 from .specs import Spec
 

omdev/git/revisions.py

@@ -0,0 +1,50 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import os.path
+import subprocess
+import typing as ta
+
+from omlish.subprocesses import subprocess_maybe_shell_wrap_exec
+from omlish.subprocesses import subprocesses
+
+
+def get_git_revision(
+        *,
+        cwd: ta.Optional[str] = None,
+) -> ta.Optional[str]:
+    subprocesses.check_output('git', '--version')
+
+    if cwd is None:
+        cwd = os.getcwd()
+
+    if subprocess.run(  # noqa
+            subprocess_maybe_shell_wrap_exec(
+                'git',
+                'rev-parse',
+                '--is-inside-work-tree',
+            ),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+    ).returncode:
+        return None
+
+    has_untracked = bool(subprocesses.check_output(
+        'git',
+        'ls-files',
+        '.',
+        '--exclude-standard',
+        '--others',
+        cwd=cwd,
+    ).decode().strip())
+
+    dirty_rev = subprocesses.check_output(
+        'git',
+        'describe',
+        '--match=NeVeRmAtCh',
+        '--always',
+        '--abbrev=40',
+        '--dirty',
+        cwd=cwd,
+    ).decode().strip()
+
+    return dirty_rev + ('-untracked' if has_untracked else '')

omdev/{git.py → git/status.py}

@@ -1,11 +1,5 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
-"""
-git status
-  --porcelain=v1
-  --ignore-submodules
-  2>/dev/null
-"""
 import dataclasses as dc
 import enum
 import os.path
@@ -16,111 +10,6 @@ from omlish.lite.check import check
 from omlish.subprocesses import subprocess_maybe_shell_wrap_exec
 
 
-##
-
-
-def git_clone_subtree(
-        *,
-        base_dir: str,
-        repo_url: str,
-        repo_dir: str,
-        branch: ta.Optional[str] = None,
-        rev: ta.Optional[str] = None,
-        repo_subtrees: ta.Sequence[str],
-) -> None:
-    if not bool(branch) ^ bool(rev):
-        raise ValueError('must set branch or rev')
-
-    if isinstance(repo_subtrees, str):
-        raise TypeError(repo_subtrees)
-
-    git_opts = [
-        '-c', 'advice.detachedHead=false',
-    ]
-
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'clone',
-            '-n',
-            '--depth=1',
-            '--filter=tree:0',
-            *(['-b', branch] if branch else []),
-            '--single-branch',
-            repo_url,
-            repo_dir,
-        ),
-        cwd=base_dir,
-    )
-
-    rd = os.path.join(base_dir, repo_dir)
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'sparse-checkout',
-            'set',
-            '--no-cone',
-            *repo_subtrees,
-        ),
-        cwd=rd,
-    )
-
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'checkout',
-            *([rev] if rev else []),
-        ),
-        cwd=rd,
-    )
-
-
-def get_git_revision(
-        *,
-        cwd: ta.Optional[str] = None,
-) -> ta.Optional[str]:
-    subprocess.check_output(subprocess_maybe_shell_wrap_exec('git', '--version'))
-
-    if cwd is None:
-        cwd = os.getcwd()
-
-    if subprocess.run(  # noqa
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            'rev-parse',
-            '--is-inside-work-tree',
-        ),
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-    ).returncode:
-        return None
-
-    has_untracked = bool(subprocess.check_output(subprocess_maybe_shell_wrap_exec(
-        'git',
-        'ls-files',
-        '.',
-        '--exclude-standard',
-        '--others',
-    ), cwd=cwd).decode().strip())
-
-    dirty_rev = subprocess.check_output(subprocess_maybe_shell_wrap_exec(
-        'git',
-        'describe',
-        '--match=NeVeRmAtCh',
-        '--always',
-        '--abbrev=40',
-        '--dirty',
-    ), cwd=cwd).decode().strip()
-
-    return dirty_rev + ('-untracked' if has_untracked else '')
-
-
-##
-
-
 _GIT_STATUS_LINE_ESCAPE_CODES: ta.Mapping[str, str] = {
     '\\': '\\',
     '"': '"',

omdev/git/subtrees.py

@@ -0,0 +1,100 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+import os.path
+import typing as ta
+
+from omlish.subprocesses import subprocesses
+
+
+@dc.dataclass(frozen=True)
+class GitSubtreeCloner:
+    base_dir: str
+    repo_url: str
+    repo_dir: str
+
+    # _: dc.KW_ONLY
+
+    repo_subtrees: ta.Sequence[str]
+
+    branch: ta.Optional[str] = None
+    rev: ta.Optional[str] = None
+
+    def __post_init__(self) -> None:
+        if not bool(self.branch) ^ bool(self.rev):
+            raise ValueError('must set branch or rev')
+
+        if isinstance(self.repo_subtrees, str):
+            raise TypeError(self.repo_subtrees)
+
+    @dc.dataclass(frozen=True)
+    class Command:
+        cmd: ta.Sequence[str]
+        cwd: str
+
+    def build_commands(self) -> ta.Iterator[Command]:
+        git_opts = [
+            '-c', 'advice.detachedHead=false',
+        ]
+
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'clone',
+                '-n',
+                '--depth=1',
+                '--filter=tree:0',
+                *(['-b', self.branch] if self.branch else []),
+                '--single-branch',
+                self.repo_url,
+                self.repo_dir,
+            ),
+            cwd=self.base_dir,
+        )
+
+        rd = os.path.join(self.base_dir, self.repo_dir)
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'sparse-checkout',
+                'set',
+                '--no-cone',
+                *self.repo_subtrees,
+            ),
+            cwd=rd,
+        )
+
+        yield GitSubtreeCloner.Command(
+            cmd=(
+                'git',
+                *git_opts,
+                'checkout',
+                *([self.rev] if self.rev else []),
+            ),
+            cwd=rd,
+        )
+
+
+def git_clone_subtree(
+        *,
+        base_dir: str,
+        repo_url: str,
+        repo_dir: str,
+        branch: ta.Optional[str] = None,
+        rev: ta.Optional[str] = None,
+        repo_subtrees: ta.Sequence[str],
+) -> None:
+    for cmd in GitSubtreeCloner(
+        base_dir=base_dir,
+        repo_url=repo_url,
+        repo_dir=repo_dir,
+        branch=branch,
+        rev=rev,
+        repo_subtrees=repo_subtrees,
+    ).build_commands():
+        subprocesses.check_call(
+            *cmd.cmd,
+            cwd=cmd.cwd,
+        )

omdev/interp/cli.py

@@ -12,7 +12,7 @@ import asyncio
 import typing as ta
 
 from omlish.lite.check import check
-from omlish.lite.runtime import check_runtime_version
+from omlish.lite.runtime import check_lite_runtime_version
 from omlish.logs.standard import configure_standard_logging
 
 from .resolvers import DEFAULT_INTERP_RESOLVER
@@ -58,7 +58,7 @@ def _build_parser() -> argparse.ArgumentParser:
 
 
 async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
-    check_runtime_version()
+    check_lite_runtime_version()
     configure_standard_logging()
 
     parser = _build_parser()

omdev/pyproject/cli.py

@@ -39,7 +39,7 @@ from omlish.argparse.cli import argparse_command
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.runtime import check_runtime_version
+from omlish.lite.runtime import check_lite_runtime_version
 from omlish.logs.standard import configure_standard_logging
 
 from ..toml.parser import toml_loads
@@ -288,7 +288,7 @@ class PyprojectCli(ArgparseCli):
 
 
 async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
-    check_runtime_version()
+    check_lite_runtime_version()
     configure_standard_logging()
 
     await PyprojectCli(argv).async_cli_run()

omdev/revisions.py

@@ -18,7 +18,7 @@ from omlish.lite.check import check
 from omlish.lite.logs import log
 from omlish.logs.standard import configure_standard_logging
 
-from .git import get_git_revision
+from .git.revisions import get_git_revision
 from .wheelfile import WheelFile
 
 

omdev/scripts/interp.py

@@ -1086,6 +1086,10 @@ def is_new_type(spec: ta.Any) -> bool:
         return isinstance(spec, types.FunctionType) and spec.__code__ is ta.NewType.__code__.co_consts[1]  # type: ignore  # noqa
 
 
+def get_new_type_supertype(spec: ta.Any) -> ta.Any:
+    return spec.__supertype__
+
+
 def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
     seen = set()
     todo = list(reversed(cls.__subclasses__()))
@@ -1806,12 +1810,12 @@ def is_debugger_attached() -> bool:
     return any(frame[1].endswith('pydevd.py') for frame in inspect.stack())
 
 
-REQUIRED_PYTHON_VERSION = (3, 8)
+LITE_REQUIRED_PYTHON_VERSION = (3, 8)
 
 
-def check_runtime_version() -> None:
-    if sys.version_info < REQUIRED_PYTHON_VERSION:
-        raise OSError(f'Requires python {REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
+def check_lite_runtime_version() -> None:
+    if sys.version_info < LITE_REQUIRED_PYTHON_VERSION:
+        raise OSError(f'Requires python {LITE_REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
 
 
 ########################################
@@ -1968,6 +1972,7 @@ TODO:
  - structured
  - prefixed
  - debug
+ - optional noisy? noisy will never be lite - some kinda configure_standard callback mechanism?
 """
 
 
@@ -2004,8 +2009,9 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardLogHandler(ProxyLogHandler):
-    pass
+class StandardConfiguredLogHandler(ProxyLogHandler):
+    def __init_subclass__(cls, **kwargs):
+        raise TypeError('This class serves only as a marker and should not be subclassed.')
 
 
 ##
@@ -2036,7 +2042,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardLogHandler]:
+) -> ta.Optional[StandardConfiguredLogHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -2044,7 +2050,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -2078,7 +2084,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardLogHandler(handler)
+        return StandardConfiguredLogHandler(handler)
 
 
 ########################################
@@ -3486,7 +3492,7 @@ def _build_parser() -> argparse.ArgumentParser:
 
 
 async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
-    check_runtime_version()
+    check_lite_runtime_version()
     configure_standard_logging()
 
     parser = _build_parser()

omdev/scripts/pyproject.py

@@ -2378,6 +2378,10 @@ def is_new_type(spec: ta.Any) -> bool:
         return isinstance(spec, types.FunctionType) and spec.__code__ is ta.NewType.__code__.co_consts[1]  # type: ignore  # noqa
 
 
+def get_new_type_supertype(spec: ta.Any) -> ta.Any:
+    return spec.__supertype__
+
+
 def deep_subclasses(cls: ta.Type[T]) -> ta.Iterator[ta.Type[T]]:
     seen = set()
     todo = list(reversed(cls.__subclasses__()))
@@ -3680,9 +3684,7 @@ class ArgparseCli:
 """
 TODO:
  - pickle stdlib objs? have to pin to 3.8 pickle protocol, will be cross-version
- - namedtuple
  - literals
- - newtypes?
 """
 
 
@@ -3692,7 +3694,7 @@ TODO:
 @dc.dataclass(frozen=True)
 class ObjMarshalOptions:
     raw_bytes: bool = False
-    nonstrict_dataclasses: bool = False
+    non_strict_fields: bool = False
 
 
 class ObjMarshaler(abc.ABC):
@@ -3821,10 +3823,10 @@ class IterableObjMarshaler(ObjMarshaler):
 
 
 @dc.dataclass(frozen=True)
-class DataclassObjMarshaler(ObjMarshaler):
+class FieldsObjMarshaler(ObjMarshaler):
     ty: type
     fs: ta.Mapping[str, ObjMarshaler]
-    nonstrict: bool = False
+    non_strict: bool = False
 
     def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return {
@@ -3836,7 +3838,7 @@ class DataclassObjMarshaler(ObjMarshaler):
         return self.ty(**{
             k: self.fs[k].unmarshal(v, ctx)
             for k, v in o.items()
-            if not (self.nonstrict or ctx.options.nonstrict_dataclasses) or k in self.fs
+            if not (self.non_strict or ctx.options.non_strict_fields) or k in self.fs
         })
 
 
@@ -3968,7 +3970,7 @@ class ObjMarshalerManager:
             ty: ta.Any,
             rec: ta.Callable[[ta.Any], ObjMarshaler],
             *,
-            nonstrict_dataclasses: bool = False,
+            non_strict_fields: bool = False,
     ) -> ObjMarshaler:
         if isinstance(ty, type):
             if abc.ABC in ty.__bases__:
@@ -3990,12 +3992,22 @@ class ObjMarshalerManager:
                 return EnumObjMarshaler(ty)
 
             if dc.is_dataclass(ty):
-                return DataclassObjMarshaler(
+                return FieldsObjMarshaler(
                     ty,
                     {f.name: rec(f.type) for f in dc.fields(ty)},
-                    nonstrict=nonstrict_dataclasses,
+                    non_strict=non_strict_fields,
+                )
+
+            if issubclass(ty, tuple) and hasattr(ty, '_fields'):
+                return FieldsObjMarshaler(
+                    ty,
+                    {p.name: rec(p.annotation) for p in inspect.signature(ty).parameters.values()},
+                    non_strict=non_strict_fields,
                 )
 
+        if is_new_type(ty):
+            return rec(get_new_type_supertype(ty))
+
         if is_generic_alias(ty):
             try:
                 mt = self._generic_mapping_types[ta.get_origin(ty)]
@@ -4129,12 +4141,12 @@ def is_debugger_attached() -> bool:
     return any(frame[1].endswith('pydevd.py') for frame in inspect.stack())
 
 
-REQUIRED_PYTHON_VERSION = (3, 8)
+LITE_REQUIRED_PYTHON_VERSION = (3, 8)
 
 
-def check_runtime_version() -> None:
-    if sys.version_info < REQUIRED_PYTHON_VERSION:
-        raise OSError(f'Requires python {REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
+def check_lite_runtime_version() -> None:
+    if sys.version_info < LITE_REQUIRED_PYTHON_VERSION:
+        raise OSError(f'Requires python {LITE_REQUIRED_PYTHON_VERSION}, got {sys.version_info} from {sys.executable}')  # noqa
 
 
 ########################################
@@ -4389,6 +4401,7 @@ TODO:
  - structured
  - prefixed
  - debug
+ - optional noisy? noisy will never be lite - some kinda configure_standard callback mechanism?
 """
 
 
@@ -4425,8 +4438,9 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardLogHandler(ProxyLogHandler):
-    pass
+class StandardConfiguredLogHandler(ProxyLogHandler):
+    def __init_subclass__(cls, **kwargs):
+        raise TypeError('This class serves only as a marker and should not be subclassed.')
 
 
 ##
@@ -4457,7 +4471,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardLogHandler]:
+) -> ta.Optional[StandardConfiguredLogHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -4465,7 +4479,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -4499,7 +4513,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardLogHandler(handler)
+        return StandardConfiguredLogHandler(handler)
 
 
 ########################################
@@ -4831,404 +4845,49 @@ class AbstractAsyncSubprocesses(BaseSubprocesses):
 
 
 ########################################
-# ../../git.py
-"""
-git status
-  --porcelain=v1
-  --ignore-submodules
-  2>/dev/null
-"""
-
-
-##
-
-
-def git_clone_subtree(
-        *,
-        base_dir: str,
-        repo_url: str,
-        repo_dir: str,
-        branch: ta.Optional[str] = None,
-        rev: ta.Optional[str] = None,
-        repo_subtrees: ta.Sequence[str],
-) -> None:
-    if not bool(branch) ^ bool(rev):
-        raise ValueError('must set branch or rev')
-
-    if isinstance(repo_subtrees, str):
-        raise TypeError(repo_subtrees)
-
-    git_opts = [
-        '-c', 'advice.detachedHead=false',
-    ]
-
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'clone',
-            '-n',
-            '--depth=1',
-            '--filter=tree:0',
-            *(['-b', branch] if branch else []),
-            '--single-branch',
-            repo_url,
-            repo_dir,
-        ),
-        cwd=base_dir,
-    )
-
-    rd = os.path.join(base_dir, repo_dir)
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'sparse-checkout',
-            'set',
-            '--no-cone',
-            *repo_subtrees,
-        ),
-        cwd=rd,
-    )
-
-    subprocess.check_call(
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            *git_opts,
-            'checkout',
-            *([rev] if rev else []),
-        ),
-        cwd=rd,
-    )
+# ../../git/revisions.py
 
 
 def get_git_revision(
         *,
         cwd: ta.Optional[str] = None,
 ) -> ta.Optional[str]:
-    subprocess.check_output(subprocess_maybe_shell_wrap_exec('git', '--version'))
+    subprocesses.check_output('git', '--version')
 
     if cwd is None:
         cwd = os.getcwd()
 
     if subprocess.run(  # noqa
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            'rev-parse',
-            '--is-inside-work-tree',
-        ),
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
+            subprocess_maybe_shell_wrap_exec(
+                'git',
+                'rev-parse',
+                '--is-inside-work-tree',
+            ),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
     ).returncode:
         return None
 
-    has_untracked = bool(subprocess.check_output(subprocess_maybe_shell_wrap_exec(
+    has_untracked = bool(subprocesses.check_output(
         'git',
         'ls-files',
         '.',
         '--exclude-standard',
         '--others',
-    ), cwd=cwd).decode().strip())
+        cwd=cwd,
+    ).decode().strip())
 
-    dirty_rev = subprocess.check_output(subprocess_maybe_shell_wrap_exec(
+    dirty_rev = subprocesses.check_output(
         'git',
         'describe',
         '--match=NeVeRmAtCh',
         '--always',
         '--abbrev=40',
         '--dirty',
-    ), cwd=cwd).decode().strip()
-
-    return dirty_rev + ('-untracked' if has_untracked else '')
-
-
-##
-
-
-_GIT_STATUS_LINE_ESCAPE_CODES: ta.Mapping[str, str] = {
-    '\\': '\\',
-    '"': '"',
-    'n': '\n',
-    't': '\t',
-}
-
-
-def yield_git_status_line_fields(l: str) -> ta.Iterator[str]:
-    def find_any(chars: str, start: int = 0) -> int:
-        ret = -1
-        for c in chars:
-            if (found := l.find(c, start)) >= 0 and (ret < 0 or ret > found):
-                ret = found
-        return ret
-
-    p = 0
-    while True:
-        if l[p] == '"':
-            p += 1
-            s = []
-            while (n := find_any('\\"', p)) > 0:
-                if (c := l[n]) == '\\':
-                    s.append(l[p:n])
-                    s.append(_GIT_STATUS_LINE_ESCAPE_CODES[l[n + 1]])
-                    p = n + 2
-                elif c == '"':
-                    s.append(l[p:n])
-                    p = n
-                    break
-                else:
-                    raise ValueError(l)
-
-            if l[p] != '"':
-                raise ValueError(l)
-
-            yield ''.join(s)
-
-            p += 1
-            if p == len(l):
-                return
-            elif l[p] != ' ':
-                raise ValueError(l)
-
-            p += 1
-
-        else:
-            if (e := l.find(' ', p)) < 0:
-                yield l[p:]
-                return
-
-            yield l[p:e]
-            p = e + 1
-
-
-"""
-When merge is occurring and was successful, or outside of a merge situation, X shows the status of the index and Y shows
-the status of the working tree:
--------------------------------------------------
-X         Y       Meaning
--------------------------------------------------
-          [AMD]   not updated
-M         [ MTD]  updated in index
-T         [ MTD]  type changed in index
-A         [ MTD]  added to index
-D                 deleted from index
-R         [ MTD]  renamed in index
-C         [ MTD]  copied in index
-[MTARC]           index and work tree matches
-[ MTARC]  M       work tree changed since index
-[ MTARC]  T       type changed in work tree since index
-[ MTARC]  D       deleted in work tree
-          R       renamed in work tree
-          C       copied in work tree
-
-When merge conflict has occurred and has not yet been resolved, X and Y show the state introduced by each head of the
-merge, relative to the common ancestor:
--------------------------------------------------
-X         Y       Meaning
--------------------------------------------------
-D         D       unmerged, both deleted
-A         U       unmerged, added by us
-U         D       unmerged, deleted by them
-U         A       unmerged, added by them
-D         U       unmerged, deleted by us
-A         A       unmerged, both added
-U         U       unmerged, both modified
-
-When path is untracked, X and Y are always the same, since they are unknown to the index:
--------------------------------------------------
-X         Y       Meaning
--------------------------------------------------
-?         ?       untracked
-!         !       ignored
-
-Submodules have more state and instead report
-
- - M = the submodule has a different HEAD than recorded in the index
- - m = the submodule has modified content
- - ? = the submodule has untracked files
-
-This is since modified content or untracked files in a submodule cannot be added via git add in the superproject to
-prepare a commit. m and ? are applied recursively. For example if a nested submodule in a submodule contains an
-untracked file, this is reported as ? as well.
-"""  # noqa
-
-
-class GitStatusState(enum.Enum):
-    UNMODIFIED = ' '
-    MODIFIED = 'M'
-    FILE_TYPE_CHANGED = 'T'
-    ADDED = 'A'
-    DELETED = 'D'
-    RENAMED = 'R'
-    COPIED = 'C'
-    UPDATED_BUT_UNMERGED = 'U'
-    UNTRACKED = '?'
-    IGNORED = '!'
-    SUBMODULE_MODIFIED_CONTENT = 'm'
-
-
-_UNMERGED_GIT_STATUS_STATES: ta.FrozenSet[GitStatusState] = frozenset([
-    GitStatusState.UPDATED_BUT_UNMERGED,
-])
-
-_UNMERGED_GIT_STATUS_STATE_PAIRS: ta.FrozenSet[ta.Tuple[GitStatusState, GitStatusState]] = frozenset([
-    (GitStatusState.ADDED, GitStatusState.ADDED),
-    (GitStatusState.DELETED, GitStatusState.DELETED),
-])
-
-
-@dc.dataclass(frozen=True)
-class GitStatusItem:
-    x: GitStatusState
-    y: GitStatusState
-
-    a: str
-    b: ta.Optional[str]
-
-    @property
-    def is_unmerged(self) -> bool:
-        return (
-            self.x in _UNMERGED_GIT_STATUS_STATE_PAIRS or
-            self.y in _UNMERGED_GIT_STATUS_STATE_PAIRS or
-            (self.x, self.y) in _UNMERGED_GIT_STATUS_STATE_PAIRS
-        )
-
-    def __repr__(self) -> str:
-        return (
-            f'{self.__class__.__name__}('
-            f'x={self.x.name}, '
-            f'y={self.y.name}, '
-            f'a={self.a!r}' +
-            (f', b={self.b!r}' if self.b is not None else '') +
-            ')'
-        )
-
-
-def parse_git_status_line(l: str) -> GitStatusItem:
-    if len(l) < 3 or l[2] != ' ':
-        raise ValueError(l)
-    x, y = l[0], l[1]
-
-    fields = list(yield_git_status_line_fields(l[3:]))
-    if len(fields) == 1:
-        a, b = fields[0], None
-    elif len(fields) == 3:
-        check.state(fields[1] == '->', l)
-        a, b = fields[0], fields[2]
-    else:
-        raise ValueError(l)
-
-    return GitStatusItem(
-        GitStatusState(x),
-        GitStatusState(y),
-        a,
-        b,
-    )
-
-
-class GitStatus(ta.Sequence[GitStatusItem]):
-    def __init__(self, lines: ta.Iterable[GitStatusItem]) -> None:
-        super().__init__()
-
-        self._lst = list(lines)
-
-        by_x: ta.Dict[GitStatusState, list[GitStatusItem]] = {}
-        by_y: ta.Dict[GitStatusState, list[GitStatusItem]] = {}
-
-        by_a: ta.Dict[str, GitStatusItem] = {}
-        by_b: ta.Dict[str, GitStatusItem] = {}
-
-        for l in self._lst:
-            by_x.setdefault(l.x, []).append(l)
-            by_y.setdefault(l.y, []).append(l)
-
-            if l.a in by_a:
-                raise KeyError(l.a)
-            by_a[l.a] = l
-
-            if l.b is not None:
-                if l.b in by_b:
-                    raise KeyError(l.b)
-                by_b[l.b] = l
-
-        self._by_x = by_x
-        self._by_y = by_y
-
-        self._by_a = by_a
-        self._by_b = by_b
-
-        self._has_unmerged = any(l.is_unmerged for l in self)
-
-    #
-
-    def __iter__(self) -> ta.Iterator[GitStatusItem]:
-        return iter(self._lst)
-
-    def __getitem__(self, index):
-        return self._lst[index]
-
-    def __len__(self) -> int:
-        return len(self._lst)
-
-    #
-
-    @property
-    def by_x(self) -> ta.Mapping[GitStatusState, ta.Sequence[GitStatusItem]]:
-        return self._by_x
-
-    @property
-    def by_y(self) -> ta.Mapping[GitStatusState, ta.Sequence[GitStatusItem]]:
-        return self._by_y
-
-    @property
-    def by_a(self) -> ta.Mapping[str, GitStatusItem]:
-        return self._by_a
-
-    @property
-    def by_b(self) -> ta.Mapping[str, GitStatusItem]:
-        return self._by_b
-
-    #
-
-    @property
-    def has_unmerged(self) -> bool:
-        return self._has_unmerged
-
-    @property
-    def has_staged(self) -> bool:
-        return any(l.x != GitStatusState.UNMODIFIED for l in self._lst)
-
-    @property
-    def has_dirty(self) -> bool:
-        return any(l.y != GitStatusState.UNMODIFIED for l in self._lst)
-
-
-def parse_git_status(s: str) -> GitStatus:
-    return GitStatus(parse_git_status_line(l) for l in s.splitlines())
-
-
-def get_git_status(
-        *,
-        cwd: ta.Optional[str] = None,
-        ignore_submodules: bool = False,
-        verbose: bool = False,
-) -> GitStatus:
-    if cwd is None:
-        cwd = os.getcwd()
-
-    proc = subprocess.run(  # type: ignore
-        subprocess_maybe_shell_wrap_exec(
-            'git',
-            'status',
-            '--porcelain=v1',
-            *(['--ignore-submodules'] if ignore_submodules else []),
-        ),
         cwd=cwd,
-        stdout=subprocess.PIPE,
-        **(dict(stderr=subprocess.PIPE) if not verbose else {}),
-        check=True,
-    )
+    ).decode().strip()
 
-    return parse_git_status(proc.stdout.decode())  # noqa
+    return dirty_rev + ('-untracked' if has_untracked else '')
 
 
 ########################################
@@ -7290,7 +6949,7 @@ class PyprojectCli(ArgparseCli):
 
 
 async def _async_main(argv: ta.Optional[ta.Sequence[str]] = None) -> None:
-    check_runtime_version()
+    check_lite_runtime_version()
     configure_standard_logging()
 
     await PyprojectCli(argv).async_cli_run()

omdev/tools/git.py

@@ -15,8 +15,8 @@ from omlish.formats import json
 from omlish.logs import all as logs
 
 from ..cli import CliModule
-from ..git import GitStatusItem
-from ..git import get_git_status
+from ..git.status import GitStatusItem
+from ..git.status import get_git_status
 
 
 def rev_parse(rev: str) -> str:

{omdev-0.0.0.dev158.dist-info → omdev-0.0.0.dev160.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev158
+Version: 0.0.0.dev160
 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.dev158
+Requires-Dist: omlish==0.0.0.dev160
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev158.dist-info → omdev-0.0.0.dev160.dist-info}/RECORD

@@ -5,16 +5,15 @@ omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
 omdev/classdot.py,sha256=YOvgy6x295I_8NKBbBlRVd3AN7Osirm_Lqt4Wj0j9rY,1631
 omdev/cmake.py,sha256=Diy2ry65806dQP125DAstD3w46z_wszMH7PwC2-6iik,4578
 omdev/findimports.py,sha256=2t8QP852saEEJFeXySEzhi_nxRSxghlkXz2jVdvy08M,2392
-omdev/git.py,sha256=sVTkHCXEXJTbSl9SRM7UnrQC775muYWVR6OB8IywUXQ,10532
 omdev/imgur.py,sha256=NK-kqGqGu4rDfpPbRyLEnIMJ2GHQQft5nSuwxLgyhNQ,2996
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
-omdev/revisions.py,sha256=FXRQubv060G8gETpshA2l68-u-ytN6BBlKoVqp2fk00,4998
+omdev/revisions.py,sha256=7Bgwd7cuKtcXJE4eDXmWP4Qx1aqZqf_LNFkOCuYS9I0,5008
 omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
 omdev/tokens.py,sha256=zh2TCAfCbcq8ZnoVdQ824jrTiwNy3XJ_oCqlZpLpcCY,1574
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=h94M-VqZ3AFBU2a8zOsjeKK7RF6uINhTHl6OiGbVMgw,163
-omdev/amalg/amalg.py,sha256=hfs1gk7pmyp8NrzIZdJcKkr__oULLeFnyQxD5OFdonE,19318
+omdev/amalg/amalg.py,sha256=qJ-Kllp4mdmx28nt_JTlQnuO-o4XZnTTZP7Uh448b68,19333
 omdev/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/antlr/consts.py,sha256=8pR6r0m0P3hAiyiAoJZ-nptd2GYbZ98mxwPL9cpaRuw,279
 omdev/antlr/gen.py,sha256=QnPyVWUrJYqHoOc3XsXA8fJdoiwAj6pyUwdG-DVrIeA,2953
@@ -29,10 +28,10 @@ omdev/cache/compute/storage.py,sha256=woCUqHg8ZrwLEejRG3zu1L5ZXxGNNXveh3E8FnlEkj
 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/cache.py,sha256=JZ5iYtJB_OPjEVLtvkLpPtKpRIImTpbY0tFUmHPtbMM,7720
+omdev/cache/data/cache.py,sha256=mxO3RqEhj1UbPgnhSQGZZ5mSLy_r5f9O05sahlP29Q4,7742
 omdev/cache/data/consts.py,sha256=d6W_aeMqgah6PmPYi9RA8Be54oQ4BcNCy8kDQ7FlB_Q,26
 omdev/cache/data/defaults.py,sha256=HrapVUIf9Ozu3qSfRPyQj-vx-dz6Yyedjb-k3yV4CW8,277
-omdev/cache/data/manifests.py,sha256=CupK71fL3_PnDzUqjrWLNt64KfGKF-K4ycMkT5p0gPA,979
+omdev/cache/data/manifests.py,sha256=4BparztsMZo9DDVVPhv6iv5g4kK7QAi8Vqtj3PbKkco,989
 omdev/cache/data/specs.py,sha256=0a9NPJ76Wz69s94KlNbr1Xma3UQ0z2oCAQN7s6uXe4w,2497
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/_boilerplate.cc,sha256=sbpXEgdFrkdzZXgaNWFFNN27fL9TZu6VrwvMY4-nnFM,1726
@@ -69,9 +68,13 @@ omdev/clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/clipboard/clipboard.py,sha256=9HFpcijpn0XDTI89ZRm2WA1G7O4HsTdVXZHqMULu3N0,1630
 omdev/clipboard/darwin_cf.py,sha256=SDUMfQtT_IJeDEwmsnxe6YyrZS5tPh_7ujkk1dg65Hg,7688
 omdev/clipboard/linux_x11.py,sha256=oa-mxMRNaZJOdBAZ8Nki-CAGIb63X8OFUTXKjmiwfSo,6718
+omdev/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/git/revisions.py,sha256=1YY3Kf2WSalNVE2TgLXmOETct8HfiVEOqfV-qcvMVr4,1161
+omdev/git/status.py,sha256=s_5kzyaSO-ikimdi54A6DrjOQPMeM5SRXLTrb22Alp4,8106
+omdev/git/subtrees.py,sha256=XFxE74PBqu_E5arpkCRRgsus5nof0TBfd2nmgh4cczA,2398
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
-omdev/interp/cli.py,sha256=3MaH1YfXbYqIa1ymAfSeP-GgZbk2djTSdhcVjVStEeE,2224
+omdev/interp/cli.py,sha256=kgqA-Pc2RVkvkEpAKde30R5JKemgwurUcG6uPaNJyFc,2234
 omdev/interp/inspect.py,sha256=ORfO90xfGftyvEJHuEOD5yPk-9mxdxn27SYHwZywWFI,2888
 omdev/interp/providers.py,sha256=yHZQ6gYjkvSmMBvrKy3I77D7PnW67Bf3igTKY8DD9K4,1839
 omdev/interp/pyenv.py,sha256=8SromtT5y6f5q0hT__-r5PZSOHg-PQc-6t-ITdS5eo4,14302
@@ -113,7 +116,7 @@ omdev/pycharm/cli.py,sha256=dYRDCzRSLBTmoNg6Flswu3gI62yAGUtoh1aNcpBUBYU,3797
 omdev/pyproject/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/pyproject/__main__.py,sha256=gn3Rl1aYPYdiTtEqa9ifi0t-e4ZwPY0vhJ4UXvYdJDY,165
 omdev/pyproject/cexts.py,sha256=x13piOOnNrYbA17qZLDVuR0p1sqhgEwpk4FtImX-klM,4281
-omdev/pyproject/cli.py,sha256=ZM-xJ77WCCQ19Qa59JG0KbI9Kmx9BRct85oe3LMLgNo,8755
+omdev/pyproject/cli.py,sha256=TXoYDfX-FotgCT9LVFfNMwqmfhfvW0-I7dYTG2ub67Y,8765
 omdev/pyproject/configs.py,sha256=K9H5cGwVLgHi8wKwtYvlXHZ9ThtmnI4jo8JAb-t1-70,2859
 omdev/pyproject/pkg.py,sha256=x71WLK3Amnt2Wjhpqz3_lBRGEdsjN5vRGlAr5eDVFqE,14552
 omdev/pyproject/reqs.py,sha256=8feZ71YnGzwKbLK4zO28CDQeNcZIIuq6cnkBhs6M-7E,2406
@@ -123,8 +126,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=VS3fF-yvykf3NWedbN4WJtvq0FSfLfDHVZp2pXBNfP4,99512
-omdev/scripts/pyproject.py,sha256=e5PodMqdqzRlTaivEemrlFYQYpb0IpWuw8qEZ032HLg,213529
+omdev/scripts/interp.py,sha256=3_c7Kdni7-oZQVrS9Vb2h1gaW5XOy9ebgShPdCapHyM,99882
+omdev/scripts/pyproject.py,sha256=d7LuBO6NzgQSjx97OMQ8r5QHABULEE2bN9-EQvBJu00,204901
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -134,7 +137,7 @@ omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/cloc.py,sha256=13lUsYLyn1LoelhsCeKrRkIwwPE0x54JmdhXJ_lvWh0,3811
 omdev/tools/doc.py,sha256=iblgUq9_7JZN2i8qmvewrz4OX0paObscBaCj8u77WqI,2555
 omdev/tools/docker.py,sha256=mu0sWnH_L1JjScfWCXXYaux03mcotCS03SD65I93qHI,7384
-omdev/tools/git.py,sha256=_ERM-VmrKrPJO9OHQEc-Jn59_Lmu3Be0Ej8kkQNGQOk,7000
+omdev/tools/git.py,sha256=zfdPnN-9WSeOQlLoTw5aqAX-UWvz-2p330dx_zaU0WQ,7014
 omdev/tools/importscan.py,sha256=nhJIhtjDY6eFVlReP7fegvv6L5ZjN-Z2VeyhsBonev4,4639
 omdev/tools/mkrelimp.py,sha256=kyu_BbUakKHEEOxNEvYWk7tH1ixCfVb3NqqT8U-BozE,4066
 omdev/tools/notebook.py,sha256=lIQIG-ytxGistyt7twuTbquSKbd7HQzR2jgBcGApwu8,3498
@@ -153,9 +156,9 @@ omdev/tools/json/rendering.py,sha256=jNShMfCpFR9-Kcn6cUFuOChXHjg71diuTC4x7Ofmz-o
 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=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev158.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev158.dist-info/METADATA,sha256=9EXzAXkkf_s5bjBdFrX6Mc17p9sgfKJiBEYHp6aAARo,1760
-omdev-0.0.0.dev158.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev158.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev158.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev158.dist-info/RECORD,,
+omdev-0.0.0.dev160.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev160.dist-info/METADATA,sha256=s2OLsw8nRKCVQHgJfv-UbxudBYvFl__fdyh86RJXeVI,1760
+omdev-0.0.0.dev160.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev160.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev160.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev160.dist-info/RECORD,,