omdev 0.0.0.dev248__tar.gz → 0.0.0.dev249__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev248
+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.dev248
+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.dev248 → 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.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.dev248 → 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.dev248 → 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.dev248 → 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:

{omdev-0.0.0.dev248 → 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.dev248 → omdev-0.0.0.dev249/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omdev
-Version: 0.0.0.dev248
+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.dev248
+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.dev248 → 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.dev248 → omdev-0.0.0.dev249}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev248 → 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.dev248'
+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.dev248',
+    'omlish == 0.0.0.dev249',
 ]
 
 [project.optional-dependencies]