omdev 0.0.0.dev303__py3-none-any.whl → 0.0.0.dev304__py3-none-any.whl

omdev/git/status.py

@@ -10,58 +10,61 @@ from omlish.lite.check import check
 from omlish.subprocesses.wrap import subprocess_maybe_shell_wrap_exec
 
 
-_GIT_STATUS_LINE_ESCAPE_CODES: ta.Mapping[str, str] = {
-    '\\': '\\',
-    '"': '"',
-    'n': '\n',
-    't': '\t',
+_GIT_STATUS_LINE_ESCAPE_CODES: ta.Mapping[int, bytes] = {
+    ord('\\'): b'\\',
+    ord('"'): b'"',
+    ord('n'): b'\n',
+    ord('t'): b'\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
+def yield_git_status_line_fields(l_: str) -> ta.Iterator[str]:
+    l = l_.encode('utf-8')
+
+    def find_any(chars: ta.Iterable[int], start: int = 0) -> int:
+        return min([f for c in chars if (f := l.find(c, start)) >= 0], default=-1)
 
     p = 0
     while True:
-        if l[p] == '"':
+        if l[p] == ord('"'):
             p += 1
-            s = []
-            while (n := find_any('\\"', p)) > 0:
-                if (c := l[n]) == '\\':
+            s: list[bytes] = []
+            while (n := find_any(b'\\"', p)) > 0:
+                if (c := l[n]) == ord('\\'):
                     s.append(l[p:n])
-                    s.append(_GIT_STATUS_LINE_ESCAPE_CODES[l[n + 1]])
-                    p = n + 2
-                elif c == '"':
+                    if ord('0') <= (x := l[n + 1]) <= ord('9'):
+                        check.state(n + 4 <= len(l))
+                        s.append(bytes([int(l[n + 1:n + 4].decode('ascii'), 8)]))
+                        p = n + 4
+                    else:
+                        s.append(_GIT_STATUS_LINE_ESCAPE_CODES[x])
+                        p = n + 2
+                elif c == ord('"'):
                     s.append(l[p:n])
                     p = n
                     break
                 else:
                     raise ValueError(l)
 
-            if l[p] != '"':
+            if l[p] != ord('"'):
                 raise ValueError(l)
 
-            yield ''.join(s)
+            yield b''.join(s).decode('utf-8')
 
             p += 1
             if p == len(l):
                 return
-            elif l[p] != ' ':
+            elif l[p] != ord(' '):
                 raise ValueError(l)
 
             p += 1
 
         else:
-            if (e := l.find(' ', p)) < 0:
-                yield l[p:]
+            if (e := l.find(b' ', p)) < 0:
+                yield l[p:].decode('utf-8')
                 return
 
-            yield l[p:e]
+            yield l[p:e].decode('utf-8')
             p = e + 1
 
 

{omdev-0.0.0.dev303.dist-info → omdev-0.0.0.dev304.dist-info}/METADATA

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

{omdev-0.0.0.dev303.dist-info → omdev-0.0.0.dev304.dist-info}/RECORD

@@ -124,7 +124,7 @@ 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
+omdev/git/status.py,sha256=Yh3q9NGwLYwOQDQkR20B2g_Y0iJj5gCoiVoxo9cT7FA,8445
 omdev/home/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/home/paths.py,sha256=zFplXTmdTs1PLe_tvZhDkkApHEpSRg-JKxZ0WVgb6P8,1325
 omdev/home/secrets.py,sha256=AOua0JKRA55_xThah2IG1e4Soo8FCXK85eH2-_kzNV0,870
@@ -277,9 +277,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.dev303.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev303.dist-info/METADATA,sha256=5Qxt8xQF6kFNIueAJ2yNy2GJSRYqhBl4_MKLadV-KzQ,1674
-omdev-0.0.0.dev303.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-omdev-0.0.0.dev303.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev303.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev303.dist-info/RECORD,,
+omdev-0.0.0.dev304.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev304.dist-info/METADATA,sha256=Tfy9B1Bcz3B8nZMMlKBOeb1m8UkjDKH1se2iXymdTaA,1674
+omdev-0.0.0.dev304.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+omdev-0.0.0.dev304.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev304.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev304.dist-info/RECORD,,

{omdev-0.0.0.dev303.dist-info → omdev-0.0.0.dev304.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any