omdev 0.0.0.dev248__py3-none-any.whl → 0.0.0.dev249__py3-none-any.whl

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

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

@@ -10,7 +10,7 @@ omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=zIP7nzcsZf5te0lphu6k36ND_cOvNFRg00neoTcoCs8,5484
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=1sZH8SLAueWxMxK9ngvndUW3L_rw7f-s_jK3ZP1yAH8,170
-omdev/amalg/gen.py,sha256=GPHXtsywa0Pb4v5pN2icMCW30bRt-yF3uKUxvBLQh1Y,6069
+omdev/amalg/gen.py,sha256=pZ5fV4tV1NgKX3Nx9RRycKTzXNyJLShYLFXMDePTevc,6155
 omdev/amalg/imports.py,sha256=me-I_FOD5874NVebZGt_wlc9kxEpuZV-XGuifbNkgNk,2073
 omdev/amalg/main.py,sha256=CNkpAMVXlBoaCmgs68rKSUlL8Xh4AuNdZjSFZPeao_4,4313
 omdev/amalg/manifests.py,sha256=CGwh-DiOU4ZKv0p_uUvdpBl2H72g468kvBHtguOHGMA,902
@@ -117,6 +117,7 @@ omdev/dataserver/routes.py,sha256=7Jai21x5z1t1zbS4mC-Sv2g0uogMJnCAX47WR81QVfI,99
 omdev/dataserver/server.py,sha256=ySEITCOxOmCXutsfYaFP46gENsg5w9jMeCySUSNUKmE,2333
 omdev/dataserver/targets.py,sha256=oKINlau7-Dk0XFP81ujU43YxvM_VTT5OnEZYIhHv4Os,3299
 omdev/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/git/magic.py,sha256=dbc58vEdN5oyfU-KjfkYsT-RKuTaoFUTwGSFK__q5TE,120
 omdev/git/revisions.py,sha256=XJDs4LAnSuETSUpV6Nv_4iDFqdzMHSixWgrH8UiP09w,1171
 omdev/git/shallow.py,sha256=pu2Dro9P7oUa-cpFkcscbay1bM6jLFfV5mevICzbjcE,2530
 omdev/git/status.py,sha256=7KKiNSgEa93TsLp54xshwEuVO-3hRiUItBEBnen-8Gg,8111
@@ -212,12 +213,12 @@ omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQ
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/bumpversion.py,sha256=2NnfRsJiZNTg-LubIwXCm2vklG7-kIR8_xFUEZNxtiY,1119
-omdev/scripts/ci.py,sha256=isgsUWvutxKJdiIOP74IV_IpPqejWU3bUBzE90gZe-0,333590
+omdev/scripts/ci.py,sha256=8pyfVn9H4ibjWacMftPpa3aLBepMnt-8t_2y-TlaL5Y,333614
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=S2O4MgtzTsFOY2IUJxsrnOIame9tEFc6aOlKP-F1JSg,1541
 omdev/scripts/importtrace.py,sha256=NjRilVNBugswrNflIhPCPHRTd-vIijqSZ8C7J8lariI,14038
-omdev/scripts/interp.py,sha256=OevpqhxklOGFp9X5HTMYLsRUdu0E8MA0x31hOexrHCQ,150775
-omdev/scripts/pyproject.py,sha256=FonWVBHZ-BbaVz6wHfJYY0mJzlUhFWtXKJIuBtHbIVA,258624
+omdev/scripts/interp.py,sha256=YeZna62GeE9KjU-T2vP_aJJ5l_zpr8fe1wtogESEhs0,150799
+omdev/scripts/pyproject.py,sha256=fl5wRVwbd9LzOSv7yXOP_ub2TOVecBw0iaQvSlWQwlc,258648
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -240,7 +241,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=j1w9nKWu_1qFzgKKcX1ZiaWBbmXA_gVkf5OobQgcL_w,11902
+omdev/tools/git/cli.py,sha256=vajcpojCKpubjanlP9O_ygHVmEFnIO6nLzMn6t4r8u0,12795
 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
@@ -254,9 +255,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.dev248.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev248.dist-info/METADATA,sha256=L42Vf63wh6iNmuCNVRtLp-T2MuVwQxKVYWQIQG8coqc,1636
-omdev-0.0.0.dev248.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-omdev-0.0.0.dev248.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev248.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev248.dist-info/RECORD,,
+omdev-0.0.0.dev249.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev249.dist-info/METADATA,sha256=jkrgO83-kHlsh5eTW09rqcXf5shrH2MD3kmkxx2DiSQ,1636
+omdev-0.0.0.dev249.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+omdev-0.0.0.dev249.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev249.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev249.dist-info/RECORD,,