fix: apply with fuzzy lines

Signed-off-by: jingfelix <jingfelix@outlook.com>

README.md

@@ -2,6 +2,12 @@
 
 Modern patch, written in Python.
 
+## Usage
+
+```shell
+patche apply <patch-file>
+```
+
 ## Config
 
 `patche` loads the configuration from a file named `.patche.env` in `$HOME`.

pyproject.toml

@@ -10,7 +10,7 @@ dependencies = [
     "pydantic>=2.5.3",
     "pydantic-settings>=2.2.1",
     "cscopy>=0.0.1",
-    "whatthepatch-pydantic==1.0.6a1",
+    "whatthepatch-pydantic==1.0.6a2",
     "structlog>=24.2.0",
 ]
 requires-python = ">=3.10"

requirements.txt

@@ -20,4 +20,4 @@ typer==0.12.3
 typer[all]==0.12.3
 typing-extensions==4.12.2
 viztracer==0.16.3
-whatthepatch-pydantic==1.0.6a1
+whatthepatch-pydantic==1.0.6a2

src/Patche/commands/apply.py

@@ -22,11 +22,13 @@ def apply(
 
     if not os.path.exists(patch_path):
         logger.error(f"Warning: {patch_path} not found!")
-        return
+        raise typer.Exit(code=1)
 
     if reverse:
         logger.info("Reversing patch...")
 
+    has_failed = False
+
     with open(patch_path, mode="r", encoding="utf-8") as (f):
         diffes = parse_patch(f.read()).diff
 
@@ -47,12 +49,17 @@ def apply(
 
                 # 检查失败数
                 for failed_hunk in apply_result.failed_hunk_list:
+                    has_failed = True
                     logger.error(f"Failed hunk: {failed_hunk.index}")
             else:
                 logger.error(f"{old_filename} not found!")
+                raise typer.Exit(code=1)
 
             # 写入文件
-            with open(new_filename, mode="w+", encoding="utf-8") as f:
-                for line in new_line_list:
-                    if line.status:
-                        f.write(line.content + "\n")
+            if not has_failed:
+                with open(new_filename, mode="w+", encoding="utf-8") as f:
+                    for line in new_line_list:
+                        if line.status:
+                            f.write(line.content + "\n")
+
+    raise typer.Exit(code=1 if has_failed else 0)

src/Patche/utils/resolve.py

@@ -1,6 +1,6 @@
 from Patche.app import logger
 from Patche.config import settings
-from Patche.model import ApplyResult, Change, Hunk, Line
+from Patche.model import ApplyResult, Hunk, Line
 from Patche.utils.common import find_list_positions
 
 
@@ -25,14 +25,15 @@ def apply_change(
 
     # 然后对每个hunk进行处理，添加偏移
     failed_hunk_list: list[Hunk] = []
+    last_pos = None
     for hunk in hunk_list:
 
         current_hunk_fuzz = 0
 
         while current_hunk_fuzz <= fuzz:
 
-            hunk.context = hunk.context[1:]
-            hunk.post = hunk.post[: fuzz - current_hunk_fuzz]
+            # hunk.context = hunk.context[1:]
+            # hunk.post = hunk.post[: fuzz - current_hunk_fuzz]
 
             logger.debug(
                 f"current_fuzz: {current_hunk_fuzz} len(hunk.context): {len(hunk.context)} len(hunk.post): {len(hunk.post)}"
@@ -49,6 +50,10 @@ def apply_change(
 
             current_hunk_fuzz += 1
 
+            if current_hunk_fuzz <= fuzz:
+                hunk.context = hunk.context[1:]
+                hunk.post = hunk.post[: 3 - current_hunk_fuzz]
+
         # 初始位置是 context 的第一个
         # 注意，前几个有可能是空
         pos_origin = None
@@ -88,6 +93,19 @@ def apply_change(
         # 选择 offset 最小的 pos
         pos_new = pos_origin + min_offset - 1
 
+        # 处理 pos_new 小于 last_pos 的情况
+        logger.debug(f"pos_origin: {pos_origin}, last_pos: {last_pos}")
+        if last_pos is None:
+            last_pos = pos_new
+        elif pos_new < last_pos:
+            # 特别主要 pos_new 小于 last_pos 的情况
+            logger.warning(f"Apply failed with hunk {hunk.index}")
+            logger.error(f"pos: {pos_new} is greater than last_pos: {last_pos}")
+            failed_hunk_list.append(hunk)
+            continue
+        else:
+            last_pos = pos_new
+
         old_lines = [
             change.line
             for change in hunk.context + hunk.middle + hunk.post