patch-fixer 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

patch_fixer/patch_fixer.py

@@ -162,7 +162,7 @@ def fix_patch(patch_lines, original):
                         ) = 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{"\n".join(current_hunk)}")
+                                                  f"\n\n{"".join(current_hunk)}")
                     fixed_lines.append(fixed_header)
                     fixed_lines.extend(current_hunk)
                     current_hunk = []
@@ -343,7 +343,7 @@ def fix_patch(patch_lines, original):
                     ) = 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{"\n".join(current_hunk)}")
+                                              f"\n\n{"".join(current_hunk)}")
                 fixed_lines.append(fixed_header)
                 fixed_lines.extend(current_hunk)
                 current_hunk = []
@@ -365,7 +365,7 @@ def fix_patch(patch_lines, original):
         ) = 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{"\n".join(current_hunk)}")
+                                  f"\n\n{"".join(current_hunk)}")
     fixed_lines.append(fixed_header)
     fixed_lines.extend(current_hunk)
 

{patch_fixer-0.2.2.dist-info → patch_fixer-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: patch-fixer
-Version: 0.2.2
+Version: 0.2.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
@@ -30,27 +30,47 @@ Dynamic: license-file
 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
-```
-git clone https://github.com/ajcm474/patch-fixer.git
-cd patch-fixer
-pip install -e .
+```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)
+>>>
 ```
-python patch_fixer.py original broken.patch fixed.patch
+### 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.
 
-## Testing
-Assuming you've already cloned the repo:
-```
+## Local Testing
+```bash
+git clone https://github.com/ajcm474/patch-fixer.git
+cd patch-fixer
 pip install -e .[test]
 pytest
 ```
-Note that some tests currently fail as this project is in the early alpha stage.
+Note that some test failures are expected as this project is in the early alpha stage.
+Please only report test failures if the same test passed in a previous version.
 
 ## License
 

patch_fixer-0.2.3.dist-info/RECORD

@@ -0,0 +1,7 @@
+patch_fixer/__init__.py,sha256=bSp2H7JW2kz1WrT0dqlg64kZpklKPp1FZlDhq2XJ2uU,34
+patch_fixer/patch_fixer.py,sha256=zZ48yd9eVfCFiUzJ31wVpcEOBH2Nq711kC2c71q-YzM,17463
+patch_fixer-0.2.3.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+patch_fixer-0.2.3.dist-info/METADATA,sha256=iAC5PmTsdyuTXnWPSvCjPVTD3nrEafqCyE8PrMxvuKs,2667
+patch_fixer-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+patch_fixer-0.2.3.dist-info/top_level.txt,sha256=yyp3KjFgExJsrFsS9ZBCnkhb05xg8hPYhB7ncdpTOv0,12
+patch_fixer-0.2.3.dist-info/RECORD,,

patch_fixer-0.2.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-patch_fixer/__init__.py,sha256=bSp2H7JW2kz1WrT0dqlg64kZpklKPp1FZlDhq2XJ2uU,34
-patch_fixer/patch_fixer.py,sha256=1Gf6LxQq3xhQVGeyD5W2-JKSJRgs9ty1C8F2QcEkyXQ,17469
-patch_fixer-0.2.2.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-patch_fixer-0.2.2.dist-info/METADATA,sha256=VCH9g8_yHZfoPJrG9ZpYB0GPSPK8pG8NfeZZVuowsSs,2004
-patch_fixer-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-patch_fixer-0.2.2.dist-info/top_level.txt,sha256=yyp3KjFgExJsrFsS9ZBCnkhb05xg8hPYhB7ncdpTOv0,12
-patch_fixer-0.2.2.dist-info/RECORD,,