omdev 0.0.0.dev247__tar.gz → 0.0.0.dev249__tar.gz

{omdev-0.0.0.dev247/omdev.egg-info → omdev-0.0.0.dev249}/PKG-INFO

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

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/.manifests.json

@@ -207,7 +207,7 @@
     "module": ".scripts.importtrace",
     "attr": "_CLI_MODULE",
     "file": "omdev/scripts/importtrace.py",
-    "line": 480,
+    "line": 477,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/importtrace",

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/amalg/gen.py

@@ -8,6 +8,7 @@ from omlish import lang
 from omlish.algorithm import all as alg
 from omlish.lite.runtime import LITE_REQUIRED_PYTHON_VERSION
 
+from ..git.magic import GIT_DIFF_OMIT_MAGIC
 from ..tokens import all as tks
 from .srcfiles import SrcFile
 from .srcfiles import make_src_file
@@ -91,6 +92,7 @@ class AmalgGenerator:
             '# @omlish-lite\n',
             '# @omlish-script\n',
             f'{OUTPUT_COMMENT.strip()} {ogf}\n',
+            f'# {GIT_DIFF_OMIT_MAGIC}\n',
         ]
 
         ruff_disables = sorted({

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/cexts/_distutils/build_ext.py

@@ -63,7 +63,6 @@ def _get_str_config_var(name: str) -> str:
 
 
 class BuildExt:
-
     @dc.dataclass(frozen=True)
     class Options:
         build_base: str | None = None

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/cexts/importhook.py

@@ -33,7 +33,6 @@ def load_dynamic(name: str, path: str) -> types.ModuleType:
 
 
 class CextImportLoader(importlib.machinery.ExtensionFileLoader):
-
     def __init__(
             self,
             filename: str,
@@ -55,7 +54,6 @@ CEXT_EXTENSIONS = ['.c', '.cc', '.cpp', '.cxx']
 
 
 class CextImportMetaFinder(importlib.abc.MetaPathFinder):
-
     def __init__(
             self,
             extensions: ta.AbstractSet[str] = frozenset(CEXT_EXTENSIONS),

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/clipboard/darwin_cf.py

@@ -237,7 +237,6 @@ _IMAGE_TYPE = 'public.png'
 
 
 class CfDarwinClipboard(Clipboard):
-
     def get(self) -> list[ClipboardContents]:
         ret: list[ClipboardContents] = []
         for i in get_darwin_clipboard_data(types={_TEXT_TYPE, _IMAGE_TYPE}):

omdev-0.0.0.dev249/omdev/git/magic.py

@@ -0,0 +1,5 @@
+# @omlish-lite
+
+
+GIT_DIFF_OMIT_MAGIC = '@omlish-git-diff-omit'
+GIT_DIFF_OMIT_MAGIC_COMMENT = f'# {GIT_DIFF_OMIT_MAGIC}'

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/mypy/debug.py

@@ -8,7 +8,6 @@ def _is_instance_or_subclass(obj, cls):
 
 
 class MypyDebugPathFinder(importlib.machinery.PathFinder):
-
     @classmethod
     def _get_spec(cls, fullname, path, target=None):  # noqa
         namespace_path = []

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/packaging/requires.py

@@ -111,7 +111,6 @@ REQUIRES_DEFAULT_RULES: ta.Dict[str, ta.Union[str, ta.Pattern[str]]] = {
 
 
 class RequiresTokenizer:
-
     def __init__(
         self,
         source: str,

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/ptk/__init__.py

@@ -23,9 +23,10 @@ from prompt_toolkit.input import DummyInput
 from prompt_toolkit.input import Input
 from prompt_toolkit.input import create_input
 from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.key_binding import KeyPress
 from prompt_toolkit.key_binding import KeyPressEvent
 from prompt_toolkit.key_binding import vi_state
-from prompt_toolkit.key_binding.vi_state import InputMode
+from prompt_toolkit.keys import Keys
 from prompt_toolkit.layout.containers import ColorColumn
 from prompt_toolkit.layout.containers import ConditionalContainer
 from prompt_toolkit.layout.containers import Float
@@ -61,10 +62,13 @@ from prompt_toolkit.lexers import SimpleLexer
 from prompt_toolkit.mouse_events import MouseEventType
 from prompt_toolkit.output import DummyOutput
 from prompt_toolkit.output import Output
+from prompt_toolkit.search import SearchDirection
 from prompt_toolkit.selection import SelectionType
+from prompt_toolkit.styles import BaseStyle
 from prompt_toolkit.styles import DynamicStyle
 from prompt_toolkit.styles import Style
 from prompt_toolkit.styles import merge_styles
+from prompt_toolkit.styles import style_from_pygments_cls
 from prompt_toolkit.widgets import Frame
 from prompt_toolkit.widgets import Label
 from prompt_toolkit.widgets import TextArea

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/pyproject/pkg.py

@@ -254,9 +254,6 @@ class BasePyprojectPackageGenerator(abc.ABC):
 
 
 class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
-
-    #
-
     @dc.dataclass(frozen=True)
     class FileContents:
         pyproject_dct: ta.Mapping[str, ta.Any]
@@ -398,9 +395,6 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
 
 
 class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
-
-    #
-
     @cached_nullary
     def find_cext_srcs(self) -> ta.Sequence[str]:
         return sorted(find_magic_files(
@@ -507,9 +501,6 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
 
 class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
-
-    #
-
     @dc.dataclass(frozen=True)
     class FileContents:
         pyproject_dct: ta.Mapping[str, ta.Any]

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/scripts/ci.py

@@ -3,6 +3,7 @@
 # @omlish-lite
 # @omlish-script
 # @omlish-amalg-output ../ci/cli.py
+# @omlish-git-diff-omit
 # ruff: noqa: N802 TC003 UP006 UP007 UP036
 """
 Inputs:

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/scripts/importtrace.py

@@ -91,7 +91,6 @@ Stats.ATTRS = [f.name for f in dc.fields(Stats)]
 
 
 class StatsFactory:
-
     def __init__(self, *, start_time: ta.Optional[float] = None) -> None:
         super().__init__()
 
@@ -186,7 +185,6 @@ class Node:
 
 
 class ImportTracer:
-
     def __init__(self, *, stringify_fields: bool = False) -> None:
         super().__init__()
 
@@ -304,7 +302,6 @@ def sqlite_retrying(max_retries: int = 10):
 
 
 class SqliteWriter:
-
     def __init__(self, db_path: str) -> None:
         super().__init__()
 

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/scripts/interp.py

@@ -3,6 +3,7 @@
 # @omlish-lite
 # @omlish-script
 # @omlish-amalg-output ../interp/cli.py
+# @omlish-git-diff-omit
 # ruff: noqa: N802 UP006 UP007 UP036
 """
 TODO:

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/scripts/pyproject.py

@@ -3,6 +3,7 @@
 # @omlish-lite
 # @omlish-script
 # @omlish-amalg-output ../pyproject/cli.py
+# @omlish-git-diff-omit
 # ruff: noqa: N802 TC003 UP006 UP007 UP036
 """
 TODO:
@@ -8004,9 +8005,6 @@ class BasePyprojectPackageGenerator(abc.ABC):
 
 
 class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
-
-    #
-
     @dc.dataclass(frozen=True)
     class FileContents:
         pyproject_dct: ta.Mapping[str, ta.Any]
@@ -8148,9 +8146,6 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
 
 
 class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
-
-    #
-
     @cached_nullary
     def find_cext_srcs(self) -> ta.Sequence[str]:
         return sorted(find_magic_files(
@@ -8257,9 +8252,6 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
 
 class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
-
-    #
-
     @dc.dataclass(frozen=True)
     class FileContents:
         pyproject_dct: ta.Mapping[str, ta.Any]

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev/tools/git/cli.py

@@ -3,6 +3,23 @@
 TODO:
  - https://github.com/vegardit/bash-funk/blob/main/docs/git.md
  - git submodule foreach 'git remote show origin | grep "HEAD branch" | cut -f5 -d" " | xargs git checkout && git pull'
+  - Handle:
+   Your branch and 'origin/main' have diverged,
+   and have 2691 and 2708 different commits each, respectively.
+     (use "git pull" if you want to integrate the remote branch with yours)
+   hint: You have divergent branches and need to specify how to reconcile them.
+   hint: You can do so by running one of the following commands sometime before
+   hint: your next pull:
+   hint:
+   hint:   git config pull.rebase false  # merge
+   hint:   git config pull.rebase true   # rebase
+   hint:   git config pull.ff only       # fast-forward only
+   hint:
+   hint: You can replace "git config" with "git config --global" to set a default
+   hint: preference for all repositories. You can also pass --rebase, --no-rebase,
+   hint: or --ff-only on the command line to override the configured default per
+   hint: invocation.
+   fatal: Need to specify how to reconcile divergent branches.
 """
 import dataclasses as dc
 import os

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev.egg-info/SOURCES.txt

@@ -127,6 +127,7 @@ omdev/dataserver/routes.py
 omdev/dataserver/server.py
 omdev/dataserver/targets.py
 omdev/git/__init__.py
+omdev/git/magic.py
 omdev/git/revisions.py
 omdev/git/shallow.py
 omdev/git/status.py

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev247 → omdev-0.0.0.dev249}/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.dev247'
+version = '0.0.0.dev249'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev247',
+    'omlish == 0.0.0.dev249',
 ]
 
 [project.optional-dependencies]