File size: 26,893 Bytes
2facf1f | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 | import re
from pathlib import Path
import difflib
import logging
from typing import Union, Optional, List, Tuple
logger = logging.getLogger(__name__)
PATCH_PATTERN = re.compile(
r"<{7}\s*SEARCH\s*\n(.*?)\n\s*={7}\s*\n(.*?)\n\s*>{7}\s*REPLACE\s*",
re.DOTALL,
)
EVOLVE_START = re.compile(r"(?:#|//|)?\s*EVOLVE-BLOCK-START")
EVOLVE_END = re.compile(r"(?:#|//|)?\s*EVOLVE-BLOCK-END")
def _mutable_ranges(text: str) -> list[tuple[int, int]]:
"""Return index ranges that are legal to edit."""
spans, stack = [], []
for m in EVOLVE_START.finditer(text):
stack.append(m.end()) # mutable starts *after* the START line
for m in EVOLVE_END.finditer(text):
if stack:
start = stack.pop()
spans.append((start, m.start())) # mutable ends *before* END line
return spans
def _inside(span: tuple[int, int], ranges: list[tuple[int, int]]) -> bool:
"""True if span is fully contained in one of the ranges."""
return any(span[0] >= a and span[1] <= b for a, b in ranges)
def _strip_trailing_whitespace(text: str) -> str:
"""Strip trailing whitespace from each line in the text."""
return "\n".join(line.rstrip() for line in text.splitlines())
def _find_indented_match(search_text: str, original_text: str) -> tuple[str, int]:
"""
Try to find search_text in original_text, and if not found, try to find
it with proper indentation. Returns (matched_text, position) or ("", -1).
"""
# Handle empty search text
if not search_text.strip():
return "", -1
# First try exact match
pos = original_text.find(search_text)
if pos != -1:
return search_text, pos
# If not found, try to find the first line with different indentation
search_lines = search_text.splitlines()
if not search_lines:
return "", -1
first_search_line = search_lines[0].strip()
if not first_search_line:
return "", -1
# Look for the first line in the original text
original_lines = original_text.splitlines()
for i, line in enumerate(original_lines):
if line.strip() == first_search_line:
# Found a potential match, get its indentation
line_indent = len(line) - len(line.lstrip())
indent_str = line[:line_indent]
# Apply this indentation to all lines in search_text
indented_search_lines = []
for j, search_line in enumerate(search_lines):
if j == 0:
# First line: use the found indentation
indented_search_lines.append(indent_str + search_line.strip())
else:
# Other lines: preserve relative indentation
search_line_indent = len(search_line) - len(search_line.lstrip())
if search_line.strip(): # Non-empty line
indented_search_lines.append(
indent_str + " " * search_line_indent + search_line.strip()
)
else: # Empty line
indented_search_lines.append("")
indented_search = "\n".join(indented_search_lines)
# Check if this indented version exists in original
indented_pos = original_text.find(indented_search)
if indented_pos != -1:
return indented_search, indented_pos
return "", -1
def _apply_indentation_to_replace(replace_text: str, indent_str: str) -> str:
"""Apply the same indentation pattern to replace text."""
if not replace_text.strip():
return replace_text
replace_lines = replace_text.splitlines()
indented_replace_lines = []
for line in replace_lines:
if line.strip(): # Non-empty line
# Preserve any existing relative indentation
line_indent = len(line) - len(line.lstrip())
indented_replace_lines.append(indent_str + " " * line_indent + line.strip())
else: # Empty line
indented_replace_lines.append("")
return "\n".join(indented_replace_lines)
def _clean_evolve_markers(text: str) -> str:
"""Remove EVOLVE-BLOCK-START and EVOLVE-BLOCK-END markers from text
if present."""
# Remove various forms of EVOLVE markers that might appear in patches
patterns_to_remove = [
r"^\s*#\s*EVOLVE-BLOCK-START\s*$", # Python style
r"^\s*//\s*EVOLVE-BLOCK-START\s*$", # C/C++/CUDA style
r"^\s*EVOLVE-BLOCK-START\s*$", # Plain text
r"^\s*#\s*EVOLVE-BLOCK-END\s*$", # Python style
r"^\s*//\s*EVOLVE-BLOCK-END\s*$", # C/C++/CUDA
r"^\s*EVOLVE-BLOCK-END\s*$", # Plain text
]
cleaned_text = text
markers_found = False
for pattern in patterns_to_remove:
if re.search(pattern, cleaned_text, flags=re.MULTILINE):
markers_found = True
cleaned_text = re.sub(pattern, "", cleaned_text, flags=re.MULTILINE)
if markers_found:
logger.debug("Removed EVOLVE-BLOCK markers from patch text")
return cleaned_text
def redact_immutable(text: str, no_state: bool = False) -> str:
out = []
for a, b in _mutable_ranges(text):
# keep immutable gap as a 1-liner placeholder
if not no_state:
out.append("<β¦ non-evolvable code omitted β¦>")
out.append(text[a:b])
if not no_state:
out.append("<β¦ non-evolvable tail omitted β¦>")
return "".join(out)
class PatchError(RuntimeError):
pass
def _find_similar_lines(
search_line: str, original_text: str, max_suggestions: int = 3
) -> List[Tuple[str, int]]:
"""Find similar lines in the original text for suggestions."""
import difflib
search_line_clean = search_line.strip()
if not search_line_clean:
return []
original_lines = original_text.splitlines()
similarities = []
for i, line in enumerate(original_lines):
line_clean = line.strip()
if not line_clean:
continue
# Calculate similarity ratio
ratio = difflib.SequenceMatcher(None, search_line_clean, line_clean).ratio()
if ratio > 0.6: # Only suggest lines with >60% similarity
similarities.append((line, i + 1, ratio))
# Sort by similarity and return top suggestions
similarities.sort(key=lambda x: x[2], reverse=True)
return [(line, line_num) for line, line_num, _ in similarities[:max_suggestions]]
def _find_best_match_with_diff(
search_text: str, original_text: str
) -> Optional[Tuple[str, int, List[str]]]:
"""Find the best matching block and return a diff comparison."""
import difflib
search_lines = search_text.strip().splitlines()
if not search_lines:
return None
original_lines = original_text.splitlines()
search_len = len(search_lines)
best_match = None
best_ratio = 0.0
best_start_line = 0
# Look for the best matching block of the same length
for i in range(len(original_lines) - search_len + 1):
candidate_lines = original_lines[i : i + search_len]
# Calculate similarity for the entire block
candidate_text = "\n".join(candidate_lines)
search_block = "\n".join(search_lines)
ratio = difflib.SequenceMatcher(None, search_block, candidate_text).ratio()
if ratio > best_ratio and ratio > 0.7: # Require >70% similarity
best_ratio = ratio
best_match = candidate_lines
best_start_line = i + 1
if best_match is None:
return None
# Generate unified diff
search_lines_labeled = [f" {line}" for line in search_lines]
match_lines_labeled = [f" {line}" for line in best_match]
diff_lines = list(
difflib.unified_diff(
search_lines_labeled,
match_lines_labeled,
fromfile="Search Pattern",
tofile=f"Actual Code (line {best_start_line})",
lineterm="",
n=0, # No context lines needed since we're showing the full blocks
)
)
# Remove the file headers and @@ lines for cleaner output
clean_diff = []
for line in diff_lines:
if (
not line.startswith("---")
and not line.startswith("+++")
and not line.startswith("@@")
):
clean_diff.append(line)
return best_match, best_start_line, clean_diff
def _get_context_lines(
text: str, position: int, context_lines: int = 2
) -> Tuple[List[str], int]:
"""Get context lines around a position in text."""
lines = text.splitlines()
if not lines:
return [], 0
# Find which line the position is on
char_count = 0
target_line = 0
for i, line in enumerate(lines):
if char_count + len(line) + 1 > position: # +1 for newline
target_line = i
break
char_count += len(line) + 1
start_line = max(0, target_line - context_lines)
end_line = min(len(lines), target_line + context_lines + 1)
context = lines[start_line:end_line]
return context, start_line + 1
def _get_line_position(text: str, line_num: int) -> int:
"""Get character position of the start of a specific line number (1-based)."""
lines = text.splitlines(keepends=True)
if line_num < 1 or line_num > len(lines):
return 0
char_pos = 0
for i in range(line_num - 1):
char_pos += len(lines[i])
return char_pos
def _char_to_line_num(text: str, char_pos: int) -> int:
"""Convert character position to line number (1-based)."""
if char_pos < 0:
return 1
lines = text.splitlines(keepends=True)
current_pos = 0
for i, line in enumerate(lines):
if current_pos + len(line) > char_pos:
return i + 1
current_pos += len(line)
return len(lines) if lines else 1
def _create_search_not_found_error(
search_text: str, original_text: str, mutable_ranges: List[Tuple[int, int]]
) -> str:
"""Create a detailed error message when search text is not found."""
search_lines = search_text.strip().splitlines()
if not search_lines:
return "Empty search text provided"
first_line = search_lines[0].strip()
# Find similar lines for suggestions
similar_lines = _find_similar_lines(first_line, original_text)
error_parts = [
"SEARCH text not found in editable regions",
"",
]
# Show the search text in a more compact way
if len(search_lines) == 1:
error_parts.extend(
[
f"Looking for: {first_line!r}",
"",
]
)
else:
line_count = len(search_lines)
error_parts.extend(
[
f"Looking for {line_count}-line block starting with: {first_line!r}",
"",
"Full search pattern:",
"```",
search_text.strip(),
"```",
"",
]
)
# Try to find the best matching block and show a diff
best_match_result = _find_best_match_with_diff(search_text, original_text)
if best_match_result:
best_match, start_line, diff_lines = best_match_result
# Check if the match is in an editable region
match_start_pos = _get_line_position(original_text, start_line)
match_text = "\n".join(best_match)
match_span = (match_start_pos, match_start_pos + len(match_text))
in_editable = _inside(match_span, mutable_ranges)
region_status = "β editable" if in_editable else "β immutable"
error_parts.extend(
[
f"Found similar code block at line {start_line} ({region_status}):",
"",
"Differences between search pattern and actual code:",
"```diff",
]
)
error_parts.extend(diff_lines)
error_parts.extend(
[
"```",
"",
]
)
if not in_editable:
error_parts.extend(
[
"β οΈ Note: The similar code is in an immutable region.",
" Look for similar code in the editable regions below.",
"",
]
)
elif similar_lines:
# Fallback to the old similar lines approach for single-line searches
error_parts.extend(
[
"Found similar text (but not exact match):",
]
)
for line, line_num in similar_lines:
# Show if it's in an editable region or not
line_pos = _get_line_position(original_text, line_num)
span = (line_pos, line_pos + len(line))
in_editable = _inside(span, mutable_ranges)
region_status = "β editable" if in_editable else "β immutable"
line_content = line.strip()
error_parts.append(f" Line {line_num}: {line_content} ({region_status})")
error_parts.append("")
# Show a more focused view of editable regions
if mutable_ranges:
error_parts.extend(
[
"Editable regions where you can make changes:",
]
)
for i, (start, end) in enumerate(mutable_ranges[:2]): # Show max 2 regions
# Convert char positions to line numbers for display
start_line = _char_to_line_num(original_text, start)
end_line = _char_to_line_num(original_text, end)
error_parts.append(f" Region {i + 1} (lines {start_line}-{end_line}):")
# Show a few key lines from this region
region_text = original_text[start:end].strip()
region_lines = region_text.splitlines()
if region_lines:
# Show first few lines and last few lines if it's long
if len(region_lines) <= 6:
for line in region_lines:
error_parts.append(f" {line}")
else:
for line in region_lines[:3]:
error_parts.append(f" {line}")
line_count = len(region_lines) - 6
error_parts.append(f" ... ({line_count} more lines)")
for line in region_lines[-3:]:
error_parts.append(f" {line}")
error_parts.append("")
if len(mutable_ranges) > 2:
remaining = len(mutable_ranges) - 2
error_parts.append(f" ... and {remaining} more regions")
error_parts.append("")
# More actionable suggestions
if similar_lines:
error_parts.extend(
[
"Quick fixes:",
"β’ Check indentation - search text must match exactly "
"including spaces/tabs",
"β’ Look for typos in the search text",
"β’ Try searching for just the first line instead of the full block",
]
)
else:
error_parts.extend(
[
"Quick fixes:",
"β’ Verify the text exists in the file",
"β’ Check that you're searching within EVOLVE-BLOCK regions",
"β’ Try a smaller, more specific search pattern",
]
)
return "\n".join(error_parts)
def _create_evolve_block_error(
matched_text: str,
position: int,
original_text: str,
mutable_ranges: List[Tuple[int, int]],
) -> str:
"""Create a detailed error message for EVOLVE-BLOCK violations."""
first_line = matched_text.splitlines()[0] if matched_text.splitlines() else ""
# Get context around the found position
context_lines, start_line_num = _get_context_lines(original_text, position, 3)
error_parts = [
"Attempted to edit outside EVOLVE-BLOCK regions",
"",
f"Found text: {first_line!r}",
f"At position: {position}",
"",
"Context around found text:",
]
for i, line in enumerate(context_lines):
line_num = start_line_num + i
marker = " >>> " if i == len(context_lines) // 2 else " "
error_parts.append(f"{marker}Line {line_num:3}: {line}")
error_parts.extend(
[
"",
"This text was found in an immutable (non-editable) region.",
"",
"Available editable regions (EVOLVE-BLOCK content):",
]
)
if mutable_ranges:
for i, (start, end) in enumerate(mutable_ranges[:3]):
region_text = original_text[start:end].strip()
region_lines = region_text.splitlines()
if region_lines:
error_parts.append(f" Region {i + 1} (chars {start}-{end}):")
for line in region_lines[:3]:
error_parts.append(f" {line}")
if len(region_lines) > 3:
error_parts.append(f" ... ({len(region_lines) - 3} more lines)")
error_parts.append("")
else:
error_parts.append(" No EVOLVE-BLOCK regions found in the code!")
error_parts.extend(
[
"Suggestions:",
"1. Move your edit to within an EVOLVE-BLOCK region",
"2. Check if similar code exists in the editable regions above",
"3. Ensure your search text targets code within # EVOLVE-BLOCK-START/END markers",
]
)
return "\n".join(error_parts)
def _create_no_evolve_block_error(original_text: str, operation: str) -> str:
"""Create an error message when no EVOLVE-BLOCK regions are found."""
lines = original_text.splitlines()
error_parts = [
f"Cannot perform {operation}: No EVOLVE-BLOCK regions found",
"",
"The code must contain EVOLVE-BLOCK regions to be editable.",
"",
"Current file structure:",
]
# Show first few lines of the file
for i, line in enumerate(lines[:10]):
error_parts.append(f" Line {i + 1:2}: {line}")
if len(lines) > 10:
error_parts.append(f" ... ({len(lines) - 10} more lines)")
error_parts.extend(
[
"",
"Expected format:",
"```",
"# Your immutable code here",
"",
"# EVOLVE-BLOCK-START",
"# Your editable code goes here",
"def function():",
" pass",
"# EVOLVE-BLOCK-END",
"",
"# More immutable code here",
"```",
"",
"Suggestions:",
"1. Add EVOLVE-BLOCK-START and EVOLVE-BLOCK-END markers around editable code",
"2. Ensure the markers are properly formatted (with # for Python, // for C/C++)",
"3. Check that there's at least one EVOLVE-BLOCK region in the file",
]
)
return "\n".join(error_parts)
def apply_search_replace(
patch_text: str,
original: str,
strict: bool = True,
) -> tuple[str, int]:
"""
Apply SEARCH/REPLACE blocks but **only** inside EVOLVE regions.
Mutable ranges are recalculated after each replacement to account for
text changes.
"""
new_text = original
num_applied = 0
for block in PATCH_PATTERN.finditer(patch_text):
search, replace = block.group(1), block.group(2)
# Clean EVOLVE markers from search and replace text if present
search = _clean_evolve_markers(search)
replace = _clean_evolve_markers(replace)
# Strip trailing whitespace from search and replace blocks
search = _strip_trailing_whitespace(search)
replace = _strip_trailing_whitespace(replace)
# Recalculate mutable ranges based on current text state
mutable = _mutable_ranges(new_text)
# ββ insertions βββββββββββββββββββββββββββββββββββββββββββββββββββββββ
if not search.strip(): # empty SEARCH β insertion
# Safe strategy: append inside the final mutable span.
if not mutable:
msg = _create_no_evolve_block_error(new_text, "insertion")
raise PatchError(msg)
a, b = mutable[-1]
new_text = new_text[:b] + replace + new_text[b:]
num_applied += 1
continue
# ββ replacements ββββββββββββββββββββββββββββββββββββββββββββββββββββ
# Try to find the search text, with indentation correction if needed
matched_search, pos = _find_indented_match(search, new_text)
if pos == -1:
if strict:
msg = _create_search_not_found_error(search, new_text, mutable)
raise PatchError(msg)
continue
span = (pos, pos + len(matched_search))
if not _inside(span, mutable):
msg = _create_evolve_block_error(matched_search, pos, new_text, mutable)
raise PatchError(msg)
# If we found an indented match, apply same indentation to replace text
if matched_search != search:
# Extract indentation from the matched search
matched_lines = matched_search.splitlines()
if matched_lines:
first_matched_line = matched_lines[0]
indent_len = len(first_matched_line) - len(first_matched_line.lstrip())
indent_str = first_matched_line[:indent_len]
replace = _apply_indentation_to_replace(replace, indent_str)
logger.debug("Applied indentation correction to search/replace block")
new_text = new_text.replace(matched_search, replace, 1)
num_applied += 1
return new_text, num_applied
def write_git_diff(
original: str,
updated: str,
filename: str,
out_path: Union[str, Path],
context: int = 9999,
) -> Path:
"""
Save a unified-diff (Git patch) of *filename* to *out_path*.
Parameters
----------
original : str
Pre-patch file contents.
updated : str
Post-patch file contents.
filename : str
Path shown inside the diff headers.
out_path : Union[str, Path]
Where to write the `.patch` file.
context : int, default 3
Number of unchanged context lines to include (-U).
"""
patch_lines = difflib.unified_diff(
original.splitlines(keepends=True),
updated.splitlines(keepends=True),
fromfile=f"a/{filename}",
tofile=f"b/{filename}",
n=context,
)
out_path = Path(out_path)
out_path.write_text("".join(patch_lines), encoding="utf-8")
return out_path
def apply_diff_patch(
patch_str: str,
original_str: Optional[str] = None,
patch_dir: Optional[Union[str, Path]] = None,
original_path: Optional[Union[str, Path]] = None,
language: str = "python",
verbose: bool = True,
) -> tuple[str, int, Optional[Path], Optional[str], Optional[str], Optional[Path]]:
"""
Apply SEARCH/REPLACE blocks to old string and optionally emit a `.patch`.
Returns the updated string, number of patches applied, path to the new
file (if patch_dir is specified), and an error message string if an
error occurred (otherwise None).
"""
if original_str is None and original_path is None:
raise ValueError("Either original_str or original_path must be provided")
if original_str is None:
og_path = Path(str(original_path))
original = og_path.read_text("utf-8")
else:
original = original_str
# Strip trailing whitespace from original text
original = _strip_trailing_whitespace(original)
error_message: Optional[str] = None
# Init with original content and 0 applied patches in case of error
updated_content: str = original
num_applied: int = 0
output_path: Optional[Path] = None
# Strip trailing whitespace from patch text
patch_str = _strip_trailing_whitespace(patch_str)
# Remove the EVOLVE-BLOCK START and EVOLVE-BLOCK END markers
if language in ["cuda", "cpp", "rust", "swift", "json", "json5"]:
patch_str = re.sub(r"// EVOLVE-BLOCK-START\\n", "", patch_str)
patch_str = re.sub(r"// EVOLVE-BLOCK-END\\n", "", patch_str)
elif language == "python":
patch_str = re.sub(r"# EVOLVE-BLOCK-START\\n", "", patch_str)
patch_str = re.sub(r"# EVOLVE-BLOCK-END\\n", "", patch_str)
else:
raise ValueError(f"Language {language} not supported")
if patch_dir is not None:
patch_dir = Path(patch_dir)
patch_dir.mkdir(parents=True, exist_ok=True)
# Store the raw search/replace blocks
patch_path = patch_dir / "search_replace.txt"
patch_path.write_text(patch_str, "utf-8")
try:
# Apply the patch
applied_content, patches_count = apply_search_replace(patch_str, original)
updated_content = applied_content
num_applied = patches_count
except PatchError as e:
error_message = str(e)
# Return original content, 0 applied, no output path, error msg
return updated_content, 0, None, error_message, None, None
if language == "python":
suffix = ".py"
elif language == "cpp":
suffix = ".cpp"
elif language == "cuda":
suffix = ".cu"
elif language == "rust":
suffix = ".rs"
elif language == "swift":
suffix = ".swift"
elif language in ["json", "json5"]:
suffix = ".json"
else:
raise ValueError(f"Language {language} not supported")
# If successful, proceed to write files if patch_dir is specified
if patch_dir is not None:
# Store the original string as a backup file
backup_path = patch_dir / f"original{suffix}"
backup_path.write_text(original, "utf-8")
# Write the updated file
output_path = patch_dir / f"main{suffix}"
output_path.write_text(updated_content, "utf-8")
# Write the git diff if requested
write_git_diff(
original,
updated_content,
filename=backup_path.name,
out_path=patch_dir / "edit.diff",
)
patch_txt = (patch_dir / "edit.diff").read_text("utf-8")
# Print the patch file
if verbose:
logger.debug(f"Patch file written to: {patch_dir / 'edit.diff'}")
logger.debug(f"Patch file content:\n{patch_txt}")
return (
updated_content,
num_applied,
output_path,
error_message,
patch_txt,
patch_dir / "edit.diff",
)
else:
return (updated_content, num_applied, None, error_message, None, None)
|