patch-fixer 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

patch_fixer/__init__.py

@@ -1 +1,2 @@
-from .patch_fixer import fix_patch
+from .patch_fixer import fix_patch
+from .split import split_patch

patch_fixer/cli.py

@@ -0,0 +1,129 @@
+#!/usr/bin/env python3
+"""Command-line interface for patch-fixer."""
+
+import argparse
+import sys
+from pathlib import Path
+
+from .patch_fixer import fix_patch
+from .split import split_patch
+
+
+def fix_command(args):
+    """Handle the fix command."""
+    with open(args.broken_patch, encoding='utf-8') as f:
+        patch_lines = f.readlines()
+
+    fixed_lines = fix_patch(patch_lines, args.original)
+
+    with open(args.output, 'w', encoding='utf-8') as f:
+        f.writelines(fixed_lines)
+
+    print(f"Fixed patch written to {args.output}")
+    return 0
+
+
+def split_command(args):
+    """Handle the split command."""
+    with open(args.patch_file, encoding='utf-8') as f:
+        patch_lines = f.readlines()
+
+    # read files to include from file or command line
+    if args.include_file:
+        with open(args.include_file, encoding='utf-8') as f:
+            files_to_include = [line.strip() for line in f if line.strip()]
+    else:
+        files_to_include = args.files or []
+
+    included, excluded = split_patch(patch_lines, files_to_include)
+
+    # write output files
+    with open(args.included_output, 'w', encoding='utf-8') as f:
+        f.writelines(included)
+
+    with open(args.excluded_output, 'w', encoding='utf-8') as f:
+        f.writelines(excluded)
+
+    print(f"Patch split into:")
+    print(f"  Included: {args.included_output} ({len(included)} lines)")
+    print(f"  Excluded: {args.excluded_output} ({len(excluded)} lines)")
+
+    return 0
+
+
+def main():
+    """Main entry point for the CLI."""
+    parser = argparse.ArgumentParser(
+        prog='patch-fixer',
+        description='Fix broken git patches or split them by file lists.'
+    )
+
+    subparsers = parser.add_subparsers(dest='command', help='Available commands')
+
+    # fix command
+    fix_parser = subparsers.add_parser(
+        'fix',
+        help='Fix a broken patch file'
+    )
+    fix_parser.add_argument(
+        'original',
+        help='Original file or directory that the patch applies to'
+    )
+    fix_parser.add_argument(
+        'broken_patch',
+        help='Path to the broken patch file'
+    )
+    fix_parser.add_argument(
+        'output',
+        help='Path where the fixed patch will be written'
+    )
+
+    # split command
+    split_parser = subparsers.add_parser(
+        'split',
+        help='Split a patch file based on file lists'
+    )
+    split_parser.add_argument(
+        'patch_file',
+        help='Path to the patch file to split'
+    )
+    split_parser.add_argument(
+        'included_output',
+        help='Output file for included files'
+    )
+    split_parser.add_argument(
+        'excluded_output',
+        help='Output file for excluded files'
+    )
+    split_parser.add_argument(
+        '-f', '--files',
+        nargs='*',
+        help='Files to include (can specify multiple)'
+    )
+    split_parser.add_argument(
+        '-i', '--include-file',
+        help='File containing list of files to include (one per line)'
+    )
+
+    # parse arguments
+    args = parser.parse_args()
+
+    if not args.command:
+        parser.print_help()
+        return 1
+
+    # dispatch to appropriate command
+    try:
+        if args.command == 'fix':
+            return fix_command(args)
+        elif args.command == 'split':
+            return split_command(args)
+    except Exception as e:
+        print(f"Error: {e}", file=sys.stderr)
+        return 1
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

patch_fixer/patch_fixer.py

@@ -204,7 +204,7 @@ def fix_patch(patch_lines, original, remove_binary=False):
                         ) = capture_hunk(current_hunk, original_lines, offset, last_hunk, hunk_context)
                     except MissingHunkError:
                         raise NotImplementedError(f"Could not find hunk in {current_file}:"
-                                                  f"\n\n{"".join(current_hunk)}")
+                                                  f"\n\n{''.join(current_hunk)}")
                     fixed_lines.append(fixed_header)
                     fixed_lines.extend(current_hunk)
                     current_hunk = []
@@ -415,7 +415,7 @@ def fix_patch(patch_lines, original, remove_binary=False):
                     ) = capture_hunk(current_hunk, original_lines, offset, last_hunk, hunk_context)
                 except MissingHunkError:
                     raise NotImplementedError(f"Could not find hunk in {current_file}:"
-                                              f"\n\n{"".join(current_hunk)}")
+                                              f"\n\n{''.join(current_hunk)}")
                 fixed_lines.append(fixed_header)
                 fixed_lines.extend(current_hunk)
                 current_hunk = []
@@ -437,7 +437,7 @@ def fix_patch(patch_lines, original, remove_binary=False):
         ) = capture_hunk(current_hunk, original_lines, offset, last_hunk, hunk_context)
     except MissingHunkError:
         raise NotImplementedError(f"Could not find hunk in {current_file}:"
-                                  f"\n\n{"".join(current_hunk)}")
+                                  f"\n\n{''.join(current_hunk)}")
     fixed_lines.append(fixed_header)
     fixed_lines.extend(current_hunk)
 

patch_fixer/split.py

@@ -0,0 +1,119 @@
+"""
+Idea:
+
+1. main function takes in:
+    a. patch file
+    b. list of files to split out
+2. reads patch file, splits based on file headers (assumed to be valid)
+3. for each file being patched:
+    a. if the file is in the list, send its hunks to output 1
+    b. otherwise send its hunks to output 2
+    c. hunks include all header lines so each output is a valid diff
+
+Could share some functionality with refactored, modular version of fix_patch
+"""
+
+import re
+from typing import List, Tuple
+
+from .patch_fixer import match_line, normalize_line, split_ab
+
+
+def get_file_path_from_diff(line: str) -> str:
+    """Extract the file path from a diff line."""
+    match_groups, line_type = match_line(line)
+    if line_type != "DIFF_LINE":
+        raise ValueError(f"Expected DIFF_LINE but got {line_type}")
+
+    # get the 'a' path (source file)
+    a_path, _ = split_ab(match_groups)
+    return a_path
+
+
+def split_patch(patch_lines: List[str], files_to_include: List[str]) -> Tuple[List[str], List[str]]:
+    """
+    Split a patch into two parts based on a list of files to include.
+
+    Parameters
+    ----------
+    patch_lines : List[str]
+        Lines of the patch file to split.
+    files_to_include : List[str]
+        List of file paths (relative, starting with ./) to include in the first output.
+        Files not in this list go to the second output.
+
+    Returns
+    -------
+    included_lines : List[str]
+        Lines for the patch containing only the included files.
+    excluded_lines : List[str]
+        Lines for the patch containing all other files.
+
+    Notes
+    -----
+    The function preserves all header information for each file's hunks
+    to ensure both output patches are valid. File paths are normalized
+    to start with './' for comparison purposes.
+
+    Raises
+    ------
+    ValueError
+        If the patch format is invalid or cannot be parsed.
+    """
+    if not patch_lines:
+        raise ValueError("Empty patch provided")
+
+    # normalize file paths to include
+    normalized_include = set()
+    for path in files_to_include:
+        if not path.startswith("./"):
+            path = f"./{path}"
+        normalized_include.add(path)
+
+    included_lines = []
+    excluded_lines = []
+    current_file_lines = []
+    current_file_path = None
+    in_file_block = False
+
+    for line in patch_lines:
+        match_groups, line_type = match_line(line)
+
+        if line_type == "DIFF_LINE":
+            # start of a new file block
+            if in_file_block and current_file_lines:
+                # output the previous file block
+                if current_file_path in normalized_include:
+                    included_lines.extend(current_file_lines)
+                else:
+                    excluded_lines.extend(current_file_lines)
+
+            # start collecting new file block
+            current_file_lines = [normalize_line(line)]
+            current_file_path = get_file_path_from_diff(line)
+            in_file_block = True
+
+        elif in_file_block:
+            # continue collecting lines for current file
+            current_file_lines.append(normalize_line(line))
+
+        else:
+            # lines before any diff (shouldn't happen in well-formed patches)
+            # add to both outputs to preserve any global headers
+            normalized = normalize_line(line)
+            included_lines.append(normalized)
+            excluded_lines.append(normalized)
+
+    # don't forget the last file block
+    if in_file_block and current_file_lines:
+        if current_file_path in normalized_include:
+            included_lines.extend(current_file_lines)
+        else:
+            excluded_lines.extend(current_file_lines)
+
+    # handle edge case where no files were split (no diff lines)
+    if not in_file_block:
+        # patch had no diff lines at all
+        return patch_lines, []
+
+    return included_lines, excluded_lines

patch_fixer-0.3.3.dist-info/METADATA

@@ -0,0 +1,123 @@
+Metadata-Version: 2.4
+Name: patch-fixer
+Version: 0.3.3
+Summary: Fixes erroneous git apply patches to the best of its ability.
+Maintainer-email: Alex Mueller <amueller474@gmail.com>
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://github.com/ajcm474/patch-fixer
+Project-URL: Issues, https://github.com/ajcm474/patch-fixer/issues
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Topic :: Software Development
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: GitPython
+Provides-Extra: test
+Requires-Dist: hypothesis; extra == "test"
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: requests; extra == "test"
+Dynamic: license-file
+
+# patch-fixer
+So you asked an LLM to generate a code diff, tried to apply it with `git apply`, and got a bunch of malformed patch errors? Well fear no more, `patch-fixer` is here to save the day... more or less.
+
+This tool can also split patches into separate files based on file lists, making it easy to selectively apply changes.
+
+## Installation
+```bash
+# Make sure you're using at least python 3.10
+python -m venv .venv/
+source .venv/bin/activate
+pip install patch-fixer
+```
+
+## Usage
+
+### Command Line Interface
+
+After installation, `patch-fixer` provides a unified command-line interface:
+
+#### Fixing broken patches:
+```bash
+patch-fixer fix original broken.patch fixed.patch
+```
+where:
+- `original` is the file or directory you were trying to patch
+- `broken.patch` is the malformed patch generated by the LLM
+- `fixed.patch` is the output file containing the (hopefully) fixed patch
+
+#### Splitting patches by file:
+```bash
+# Split with files specified on command line
+patch-fixer split input.patch included.patch excluded.patch -f file1.py file2.py
+
+# Split using a file list
+patch-fixer split input.patch included.patch excluded.patch -i files_to_include.txt
+```
+where:
+- `input.patch` is the patch file to split
+- `included.patch` will contain changes for the specified files
+- `excluded.patch` will contain changes for all other files
+- `-f` allows specifying files directly on the command line
+- `-i` reads the file list from a text file (one file per line)
+
+### Python API
+
+#### Fixing patches:
+```python
+from patch_fixer import fix_patch
+
+patch_file = "/path/to/broken.patch"
+original = "/path/to/original/state"    # file or directory being patched
+with open(patch_file, encoding="utf-8") as f:
+    patch_lines = f.readlines()
+    
+fixed_lines = fix_patch(patch_lines, original)
+output_file = "/path/to/fixed.patch"
+
+with open(output_file, 'w', encoding='utf-8') as f:
+    f.writelines(fixed_lines)
+```
+
+#### Splitting patches:
+```python
+from patch_fixer import split_patch
+
+with open("input.patch", encoding="utf-8") as f:
+    patch_lines = f.readlines()
+
+# split to include only specific files
+files_to_include = ["./src/main.py", "./src/utils.py"]
+included, excluded = split_patch(patch_lines, files_to_include)
+
+# write the split patches
+with open("included.patch", 'w', encoding='utf-8') as f:
+    f.writelines(included)
+    
+with open("excluded.patch", 'w', encoding='utf-8') as f:
+    f.writelines(excluded)
+```
+
+## Local Testing
+```bash
+git clone https://github.com/ajcm474/patch-fixer.git
+cd patch-fixer
+pip install -e .[test]
+pytest
+```
+From version `0.3.0` onward (at least until version `1.0`), some test failures are expected
+in bugfix versions as I like to use test-driven development to build out new features. 
+Please only report test failures if the same test existed and passed in the most recent `0.x.0` version.
+
+## License
+
+This is free and open source software, released under the Apache 2.0 License. See `LICENSE` for details.

patch_fixer-0.3.3.dist-info/RECORD

@@ -0,0 +1,10 @@
+patch_fixer/__init__.py,sha256=n5DDMr4jbO3epK3ybBvjDyRddTWlWamN6ao5BC7xHFo,65
+patch_fixer/cli.py,sha256=hgneS8DSCWBxv1l0u37n60FPGskAsDgodX9YxKgF-H0,3417
+patch_fixer/patch_fixer.py,sha256=GAavb15H5cEoNFgGlO5hIY7EOF88VCsjHcLrfyGW4_0,20587
+patch_fixer/split.py,sha256=l0rHM6-ZBuB9Iv6Ng6rxqZH5eKfvk2t87j__nDu67kM,3869
+patch_fixer-0.3.3.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+patch_fixer-0.3.3.dist-info/METADATA,sha256=URfv2ws8naMvx3t8xsqN5JyGBlC38EydFYPwgivTnvQ,4117
+patch_fixer-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+patch_fixer-0.3.3.dist-info/entry_points.txt,sha256=ftc6dP6B1zJouSPeCCJLZtx-EEGVSrNEwy4YhtnEoxA,53
+patch_fixer-0.3.3.dist-info/top_level.txt,sha256=yyp3KjFgExJsrFsS9ZBCnkhb05xg8hPYhB7ncdpTOv0,12
+patch_fixer-0.3.3.dist-info/RECORD,,

patch_fixer-0.3.3.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+patch-fixer = patch_fixer.cli:main

patch_fixer-0.3.1.dist-info/METADATA

@@ -1,79 +0,0 @@
-Metadata-Version: 2.4
-Name: patch-fixer
-Version: 0.3.1
-Summary: Fixes erroneous git apply patches to the best of its ability.
-Maintainer-email: Alex Mueller <amueller474@gmail.com>
-License-Expression: Apache-2.0
-Project-URL: Homepage, https://github.com/ajcm474/patch-fixer
-Project-URL: Issues, https://github.com/ajcm474/patch-fixer/issues
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
-Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Topic :: Software Development
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: GitPython
-Provides-Extra: test
-Requires-Dist: hypothesis; extra == "test"
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: requests; extra == "test"
-Dynamic: license-file
-
-# patch-fixer
-So you asked an LLM to generate a code diff, tried to apply it with `git apply`, and got a bunch of malformed patch errors? Well fear no more, `patch_fixer.py` is here to save the day... more or less.
-
-## Installation
-```bash
-# Make sure you're using at least python 3.10
-python -m venv .venv/
-source .venv/bin/activate
-pip install patch-fixer
-```
-
-## Usage
-### API:
-```python
->>> from patch_fixer import fix_patch
->>>
->>> patch_file = "/path/to/broken.patch"
->>> original = "/path/to/original/state"    # file or directory being patched
->>> with open(patch_file, encoding="utf-8") as f:
-...     patch_lines = f.readlines()
-...     
->>> fixed_lines = fix_patch(patch_lines, original)
->>> output_file = "/path/to/fixed.patch"
->>>
->>> with open(output_file, 'w', encoding='utf-8') as f:
-...     f.writelines(fixed_lines)
->>>
-```
-### Command line:
-```bash
-python patch_fixer/patch_fixer.py original broken.patch fixed.patch
-```
-where `original` is the file or directory you were trying to patch, 
-`broken.patch` is the malformed patch generated by the LLM, 
-and `fixed.patch` is the output file containing the (hopefully) fixed patch.
-
-## Local Testing
-```bash
-git clone https://github.com/ajcm474/patch-fixer.git
-cd patch-fixer
-pip install -e .[test]
-pytest
-```
-From version `0.3.0` onward (at least until version `1.0`), some test failures are expected
-in bugfix versions as I like to use test-driven development to build out new features. 
-Please only report test failures if the same test existed and passed in the most recent `0.x.0` version.
-
-## License
-
-This is free and open source software, released under the Apache 2.0 License. See `LICENSE` for details.

patch_fixer-0.3.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-patch_fixer/__init__.py,sha256=bSp2H7JW2kz1WrT0dqlg64kZpklKPp1FZlDhq2XJ2uU,34
-patch_fixer/patch_fixer.py,sha256=1Ny2NwVL4qStbVCrv6QE3b_8oPsFkPomJDLoAGUqNvI,20587
-patch_fixer-0.3.1.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-patch_fixer-0.3.1.dist-info/METADATA,sha256=iOhEx8d5WJV3X-mMu-0hAjQWXD-gBEPWKkiE-HnNyso,2828
-patch_fixer-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-patch_fixer-0.3.1.dist-info/top_level.txt,sha256=yyp3KjFgExJsrFsS9ZBCnkhb05xg8hPYhB7ncdpTOv0,12
-patch_fixer-0.3.1.dist-info/RECORD,,