conflict-split 0.1.0__py3-none-any.whl

conflict_split-0.1.0.dist-info/METADATA

@@ -0,0 +1,36 @@
+Metadata-Version: 2.4
+Name: conflict-split
+Version: 0.1.0
+Summary: Resolve git conflict markers in any file by keeping ours, theirs, both or the diff3 base. Stdlib only.
+Author-email: agent-one <rafal.baranowski.iot@gmail.com>
+License: MIT
+Project-URL: Homepage, https://github.com/rafal-one/conflict-split
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Dynamic: license-file
+
+# conflict-split
+
+Resolve git conflict markers (`<<<<<<<`, `|||||||`, `=======`, `>>>>>>>`) in **any** text file
+after the fact, by keeping one side for every conflict. Handles diff3/zdiff3 style, CRLF files,
+multiple conflicts. Python 3.9+, stdlib only.
+
+```
+pip install conflict-split
+conflict-split data.json --take theirs -i     # keep the incoming side, rewrite the file
+conflict-split notes.txt --take both          # keep both sides, print to stdout
+conflict-split f.txt --count                  # number of conflicts
+```
+
+`--take ours|theirs|both|base` (`base` needs diff3 markers). Exit codes: 0 ok, 1 malformed markers
+(unterminated/nested), 2 file or encoding error. For cell-wise merging of CSV files use
+[csv-conflict](https://github.com/rafal-one/csv-conflict).
+
+## Tests
+`pytest` (15 tests; run on Python 3.9 and 3.14).
+
+## Support
+Free, MIT licensed. If it saved you time: https://paypal.me/RafalBaranowski

conflict_split-0.1.0.dist-info/RECORD

@@ -0,0 +1,7 @@
+conflict_split.py,sha256=LPHbA9U2_d5uEazd4ErGGE8V2dy2tPIUGnGLkKJwFUo,3815
+conflict_split-0.1.0.dist-info/licenses/LICENSE,sha256=-hZriFiksFsGGM2WbhdnQzoXUOFuMGve5P3y4pvA0Ws,1066
+conflict_split-0.1.0.dist-info/METADATA,sha256=liIgNchWZmeCcE9Vr3AtJviTRj_BDEkVB1W0ROm2tb0,1437
+conflict_split-0.1.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+conflict_split-0.1.0.dist-info/entry_points.txt,sha256=tGotNWkTyq6lnpdOUOYSY_Db9UrIGsFco3KfP9DsQ5M,55
+conflict_split-0.1.0.dist-info/top_level.txt,sha256=5hCl57uWjA2lhSQ4Psy1hPVxGdh0oavtTNV_14pTXbY,15
+conflict_split-0.1.0.dist-info/RECORD,,

conflict_split-0.1.0.dist-info/WHEEL

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

conflict_split-0.1.0.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+conflict-split = conflict_split:main

conflict_split-0.1.0.dist-info/licenses/LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2026 agent-one
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

conflict_split-0.1.0.dist-info/top_level.txt

@@ -0,0 +1 @@
+conflict_split

conflict_split.py

@@ -0,0 +1,111 @@
+"""Resolve git conflict markers in any text file by keeping one side. Stdlib only."""
+import argparse
+import re
+import sys
+
+__version__ = "0.1.0"
+START = re.compile(r"^<{7}(?: .*)?$")
+BASE = re.compile(r"^\|{7}(?: .*)?$")
+MID = re.compile(r"^={7}$")
+END = re.compile(r"^>{7}(?: .*)?$")
+CHOICES = ("ours", "theirs", "both", "base")
+
+
+class ConflictError(Exception):
+    pass
+
+
+def parse(text):
+    """Return list of segments: str (plain text) or dict(ours, base, theirs) of line lists."""
+    segs, plain = [], []
+    state, cur, n = None, None, 0
+    for n, line in enumerate(text.splitlines(keepends=True), 1):
+        body = line.rstrip("\r\n")
+        if state is None:
+            if START.match(body):
+                if plain:
+                    segs.append("".join(plain))
+                    plain = []
+                cur = {"ours": [], "base": None, "theirs": [], "line": n}
+                state = "ours"
+            else:
+                plain.append(line)
+        elif state == "ours" and BASE.match(body):
+            cur["base"], state = [], "base"
+        elif state in ("ours", "base") and MID.match(body):
+            state = "theirs"
+        elif state == "theirs" and END.match(body):
+            segs.append(cur)
+            state = None
+        elif START.match(body):
+            raise ConflictError(f"line {n}: nested conflict marker")
+        else:
+            cur["base" if state == "base" else state].append(line)
+    if state is not None:
+        raise ConflictError(f"conflict starting at line {cur['line']} is not terminated")
+    if plain:
+        segs.append("".join(plain))
+    return segs
+
+
+def resolve(text, take="ours"):
+    if take not in CHOICES:
+        raise ValueError(f"take must be one of {CHOICES}")
+    out = []
+    for s in parse(text):
+        if isinstance(s, str):
+            out.append(s)
+        elif take == "base":
+            if s["base"] is None:
+                raise ConflictError(f"conflict at line {s['line']} has no base (not diff3 style)")
+            out.extend(s["base"])
+        elif take == "both":
+            out.extend(s["ours"] + s["theirs"])
+        else:
+            out.extend(s[take])
+    return "".join(out)
+
+
+def count(text):
+    return sum(1 for s in parse(text) if isinstance(s, dict))
+
+
+def main(argv=None):
+    p = argparse.ArgumentParser(prog="conflict-split",
+                                description="Resolve git conflict markers by keeping one side.")
+    p.add_argument("file", help="file with markers, or - for stdin")
+    p.add_argument("--take", choices=CHOICES, default="ours", help="side to keep (default ours)")
+    p.add_argument("--count", action="store_true", help="only print the number of conflicts")
+    p.add_argument("-o", "--output", help="write here instead of stdout")
+    p.add_argument("-i", "--in-place", action="store_true", help="rewrite the input file")
+    p.add_argument("--version", action="version", version=__version__)
+    a = p.parse_args(argv)
+    if a.in_place and a.file == "-":
+        p.error("--in-place needs a file")
+    try:
+        if a.file == "-":
+            text = sys.stdin.read()
+        else:
+            with open(a.file, newline="", encoding="utf-8") as f:
+                text = f.read()
+        if a.count:
+            print(count(text))
+            return 0
+        res = resolve(text, a.take)
+    except (OSError, UnicodeDecodeError) as e:
+        print(f"conflict-split: {e}", file=sys.stderr)
+        return 2
+    except ConflictError as e:
+        print(f"conflict-split: {e}", file=sys.stderr)
+        return 1
+    target = a.file if a.in_place else a.output
+    if target:
+        with open(target, "w", newline="", encoding="utf-8") as f:
+            f.write(res)
+    else:
+        sys.stdout.write(res)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())