Add -i option to mimic GNU patch more and collect coverage for subprocesses

.github/workflows/build_exe.yml

@@ -0,0 +1,51 @@
+name: Build patch exe for Windows
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  windows_exe:
+    name: Create windows executable
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+          architecture: x64
+      - uses: Nuitka/Nuitka-Action@main
+        with:
+          nuitka-version: main
+          script-name: patch_ng.py
+          mode: onefile
+          output-dir: build
+          output-file: patch.exe
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: Release ${{ github.ref }}
+          body: |
+            Automatic build of patch.exe
+          draft: true
+          prerelease: false
+      - name: Upload release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./build/patch.exe
+          asset_name: patch.exe
+          asset_content_type: application/vnd.microsoft.portable-executable
+      - name: Publish release
+        uses: StuYarrow/publish-release@v1.1.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          id: ${{ steps.create_release.outputs.id }}

LICENSE

@@ -1,3 +1,42 @@
+Copyright (c) 2025 Tim Felgentreff
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any
+person obtaining a copy of this software, associated documentation and/or data
+(collectively the "Software"), free of charge and under any and all copyright
+rights in the Software, and any and all patent rights owned or freely
+licensable by each licensor hereunder covering either (i) the unmodified
+Software as contributed to or provided by such licensor, or (ii) the Larger
+Works (as defined below), to deal in both
+
+(a) the Software, and
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+one is included with the Software (each a "Larger Work" to which the Software
+is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create
+derivative works of, display, perform, and distribute the Software and make,
+use, sell, offer for sale, import, export, have made, and have sold the
+Software and the Larger Work(s), and to sublicense the foregoing rights on
+either these or other terms.
+
+This license is subject to the following condition:
+The above copyright notice and either this complete permission notice or at
+a minimum a reference to the UPL must 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.
+
+This file incorporates prior work covered by the following copyright and
+permission notice:
+
 MIT License
 -----------
 

patch_ng.py

@@ -4,6 +4,47 @@
 
     Brute-force line-by-line non-recursive parsing
 
+    Copyright (c) 2025 Tim Felgentreff
+
+    The Universal Permissive License (UPL), Version 1.0
+
+    Subject to the condition set forth below, permission is hereby granted to any
+    person obtaining a copy of this software, associated documentation and/or data
+    (collectively the "Software"), free of charge and under any and all copyright
+    rights in the Software, and any and all patent rights owned or freely
+    licensable by each licensor hereunder covering either (i) the unmodified
+    Software as contributed to or provided by such licensor, or (ii) the Larger
+    Works (as defined below), to deal in both
+
+    (a) the Software, and
+    (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+    one is included with the Software (each a "Larger Work" to which the Software
+    is contributed by such licensors),
+
+    without restriction, including without limitation the rights to copy, create
+    derivative works of, display, perform, and distribute the Software and make,
+    use, sell, offer for sale, import, export, have made, and have sold the
+    Software and the Larger Work(s), and to sublicense the foregoing rights on
+    either these or other terms.
+
+    This license is subject to the following condition:
+    The above copyright notice and either this complete permission notice or at
+    a minimum a reference to the UPL must 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.
+
+    This file incorporates prior work covered by the following copyright and
+    permission notice:
+
+---
+
     Copyright (c) 2008-2016 anatoly techtonik
     Available under the terms of MIT license
 
@@ -31,7 +72,7 @@
 from __future__ import print_function
 
 __author__ = "Conan.io <info@conan.io>"
-__version__ = "1.18.0"
+__version__ = "1.19.0"
 __license__ = "MIT"
 __url__ = "https://github.com/conan-io/python-patch"
 
@@ -109,20 +150,18 @@ def createLock(self):
 
 debugmode = False
 
-def setdebug():
-  global debugmode, streamhandler
 
+def setdebug():
+  global debugmode
   debugmode = True
-  loglevel = logging.DEBUG
-  logformat = "%(levelname)8s %(message)s"
-  logger.setLevel(loglevel)
+  logger.setLevel(logging.DEBUG)
+  streamhandler.setFormatter(logging.Formatter("%(levelname)8s %(message)s"))
 
-  if streamhandler not in logger.handlers:
-    # when used as a library, streamhandler is not added
-    # by default
-    logger.addHandler(streamhandler)
 
-  streamhandler.setFormatter(logging.Formatter(logformat))
+if streamhandler not in logger.handlers:
+  # when used as a library, streamhandler is not added
+  # by default
+  logger.addHandler(streamhandler)
 
 
 #------------------------------------------------
@@ -761,8 +800,10 @@ def _detect_type(self, p):
         if p.header[idx].startswith(b"diff --git"):
           break
       if p.header[idx].startswith(b'diff --git a/'):
+        # git-format-patch with --full-index generates full blob index, which is 40 symbols length
+        # shortcut index length may vary, seems to depend on the project size
         if (idx+1 < len(p.header)
-            and re.match(b'(?:index \\w{7}..\\w{7} \\d{6}|new file mode \\d*)', p.header[idx+1])):
+            and re.match(b'(?:index \\w{7,40}..\\w{7,40} \\d{6}|new file mode \\d*)', p.header[idx+1])):
           if DVCS:
             return GIT
 
@@ -791,12 +832,14 @@ def _detect_type(self, p):
 
   def _normalize_filenames(self):
     """ sanitize filenames, normalizing paths, i.e.:
-        1. strip a/ and b/ prefixes from GIT and HG style patches
-        2. remove all references to parent directories (with warning)
-        3. translate any absolute paths to relative (with warning)
+        1. remove all references to parent directories (with warning)
+        2. translate any absolute paths to relative (with warning)
 
         [x] always use forward slashes to be crossplatform
             (diff/patch were born as a unix utility after all)
+        [x] Do *not* strip a/ and b/ prefixes from GIT and HG style
+            patches, GNU patch would not do so, instead the user
+            *must* account for this in the -p/--strip option
 
         return None
     """
@@ -807,18 +850,6 @@ def _normalize_filenames(self):
         debug("    patch type = %s" % p.type)
         debug("    source = %s" % p.source)
         debug("    target = %s" % p.target)
-      if p.type in (HG, GIT):
-        debug("stripping a/ and b/ prefixes")
-        if p.source != b'/dev/null':
-          if not p.source.startswith(b"a/"):
-            warning("invalid source filename")
-          else:
-            p.source = p.source[2:]
-        if p.target != b'/dev/null':
-          if not p.target.startswith(b"b/"):
-            warning("invalid target filename")
-          else:
-            p.target = p.target[2:]
 
       p.source = xnormpath(p.source)
       p.target = xnormpath(p.target)
@@ -981,9 +1012,11 @@ def apply(self, strip=0, root=None, fuzz=False):
         hunks = [s.decode("utf-8") for s in item.hunks[0].text]
         new_file = "".join(hunk[1:] for hunk in hunks)
         save(target, new_file)
+        info(f"successfully created {target}")
       elif "dev/null" in target:
         source = self.strip_path(source, root, strip)
         safe_unlink(source)
+        info(f"successfully deleted {target}")
       else:
         items.append(item)
     self.items = items
@@ -1039,9 +1072,13 @@ def apply(self, strip=0, root=None, fuzz=False):
       validhunks = 0
       canpatch = False
       for lineno, line in enumerate(f2fp):
-        if lineno+1 < hunk.startsrc:
+        last_line = f2fp.peek(1) == b''
+        if lineno + 1 < hunk.startsrc and not last_line:
           continue
-        elif lineno+1 == hunk.startsrc:
+        elif lineno + 1 == hunk.startsrc or (last_line and lineno + 1 < hunk.startsrc):
+          # If the patch just appends without context, be gracious
+          if last_line and lineno + 1 < hunk.startsrc:
+            lineno = hunk.startsrc - 1
           hunkfind = [x[1:].rstrip(b"\r\n") for x in hunk.text if x[0] in b" -"]
           hunkreplace = [x[1:].rstrip(b"\r\n") for x in hunk.text if x[0] in b" +"]
           #pprint(hunkreplace)
@@ -1303,7 +1340,8 @@ def main():
 
   opt = OptionParser(usage="1. %prog [options] unified.diff\n"
                     "       2. %prog [options] http://host/patch\n"
-                    "       3. %prog [options] -- < unified.diff",
+                    "       3. %prog [options] -- < unified.diff"
+                    "       4. %prog [options] -i unified.diff",
                      version="python-patch %s" % __version__)
   opt.add_option("-q", "--quiet", action="store_const", dest="verbosity",
                                   const=0, help="print only warnings and errors", default=1)
@@ -1319,13 +1357,15 @@ def main():
   opt.add_option("--revert", action="store_true",
                                            help="apply patch in reverse order (unpatch)")
   opt.add_option("-f", "--fuzz", action="store_true", dest="fuzz", help="Accept fuuzzy patches")
+  opt.add_option("-i", "--input", metavar='PATCHFILE',
+                                           help="Read patch from PATCHFILE instead of stdin.")
   (options, args) = opt.parse_args()
 
-  if not args and sys.argv[-1:] != ['--']:
+  if not args and not options.input and sys.argv[-1:] != ['--']:
     opt.print_version()
     opt.print_help()
     sys.exit()
-  readstdin = (sys.argv[-1:] == ['--'] and not args)
+  readstdin = (sys.argv[-1:] == ['--'] and not args and not options.input)
 
   verbosity_levels = {0:logging.WARNING, 1:logging.INFO, 2:logging.DEBUG}
   loglevel = verbosity_levels[options.verbosity]
@@ -1337,9 +1377,11 @@ def main():
     setdebug()  # this sets global debugmode variable
 
   if readstdin:
-    patch = PatchSet(sys.stdin)
+    patch = PatchSet(sys.stdin.buffer)
   else:
-    patchfile = args[0]
+    patchfile = options.input if options.input else args[0]
+    if options.directory and not os.path.isabs(patchfile):
+      patchfile = os.path.join(options.directory, patchfile)
     urltest = patchfile.split(':')[0]
     if (':' in patchfile and urltest.isalpha()
         and len(urltest) > 1): # one char before : is a windows drive letter

pyproject.toml

@@ -1,3 +1,5 @@
 [build-system]
 requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"
+[tool.coverage.run]
+parallel = true

setup.py

@@ -120,9 +120,9 @@ def load_version():
     # To provide executable scripts, use entry points in preference to the
     # "scripts" keyword. Entry points provide cross-platform support and allow
     # pip to create the appropriate form of executable for the target platform.
-    #entry_points={
-    #    'console_scripts': [
-    #        'patch_ng.py=patch',
-    #    ],
-    #},
+    entry_points={
+       'console_scripts': [
+           'patch = patch_ng:main',
+       ],
+    },
 )

tests/12appendonly/12appendonly.patch

@@ -0,0 +1,8 @@
+diff --git a/Jamroot b/Jamroot
+index a6981dd..0c08f09 100644
+--- a/Jamroot
++++ b/Jamroot
+@@ -4,0 +4,3 @@
++X
++Y
++Z

tests/12appendonly/Jamroot

@@ -0,0 +1,3 @@
+X
+Y
+Z

tests/12appendonly/[result]/Jamroot

@@ -0,0 +1,6 @@
+X
+Y
+Z
+X
+Y
+Z

tests/recoverage.bat

@@ -1,4 +1,5 @@
 cd ..
 python -m coverage run tests/run_tests.py
+python -m coverage combine
 python -m coverage html -d tests/coverage
 python -m coverage report -m