omdev 0.0.0.dev302__tar.gz → 0.0.0.dev304__tar.gz

{omdev-0.0.0.dev302/omdev.egg-info → omdev-0.0.0.dev304}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev302
+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.dev302
+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.dev302 → omdev-0.0.0.dev304}/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.dev302 → omdev-0.0.0.dev304/omdev.egg-info}/PKG-INFO

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

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

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