Up to [cvs.NetBSD.org] / pkgsrc / devel / patchutils
Request diff between arbitrary revisions
Keyword substitution: kv
Default branch: MAIN
patchutils: updated to 0.4.5 0.4.5 (stable) Reverted incompatible behavior change from version 0.4.4. In 0.4.4, Git diffs without content hunks (renames, copies, mode-only changes, binary files) were included in output and file numbering, breaking compatibility with 0.4.3 and earlier versions. This caused file numbers to change for scripts using -N/-F options. The 0.4.3 behavior has been restored as the default: these diffs are now excluded from output and numbering. Added --git-extended-diffs option to control this behavior: use --git-extended-diffs=include to get the 0.4.4 behavior if needed. The default will change to 'include' in version 0.5.0 for modern Git workflow support. Fixed grepdiff -s/--status to display correct file status indicators. Previously, grepdiff -s incorrectly showed '!' (modification) for all matching files regardless of whether they were additions, deletions, or modifications. Now correctly shows '+' for file additions, '-' for file removals, and '!' for file modifications. Added comprehensive test coverage for grepdiff -s with both unified and context diff formats. Documented and enabled --empty-files-as-absent option for grepdiff (long form only, as -E is used for --extended-regexp). Improved error handling for command pipelines. Fixed pipe handling to properly propagate errors when commands in a pipeline fail, and corrected stdout/stdin piping behavior (stderr is no longer redirected to pipes). Replaced old Git/SVN patchview scripts with unified patchview-wrapper. The gitdiff, gitdiffview, gitshow, gitshowview, svndiff, and svndiffview commands are now symlinks to a single patchview-wrapper script with improved pipeline handling and debug support. Symlinks are now automatically generated during installation rather than tracked in source control. Documentation improvements. Enhanced grepdiff documentation with better organization and comprehensive examples showing different output modes. Clarified bootstrap requirements in README.md. Restored move-to-front script to package. Build system and CI improvements. Updated GitHub Actions CI to run on 0.4.x branch. Conditionally enabled building from Git repository. Updated spec file and .gitignore files. Fixed binary file handling in lsdiff and filterdiff. Binary files now receive sequential file numbers instead of duplicate numbers when using lsdiff -N. Fixed filterdiff -F (file number filter) to properly filter binary file messages - previously binary file "Binary files ... differ" messages were not being filtered and would appear in output regardless of the requested file number.
patchutils: updated to 0.4.4 0.4.4 Enhanced Git diff format support in filterdiff/lsdiff/grepdiff. Improved handling of Git diffs without traditional hunks, including proper support for file renames, binary file changes, and permission mode changes. Fixed exclusion filtering (-x) for multi-file Git diffs to prevent orphaned headers. Enhanced filename extraction to properly strip Git's a/ and b/ prefixes for consistent output. Added --git-prefixes=strip|keep option to control handling of Git filename prefixes, with 'keep' as default for backward compatibility (will change to 'strip' in version 0.5.0). Fixed interdiff --color option handling and improved color output. Replaced external diff --color dependency with internal ANSI color codes. Code improvements and build system enhancements. Added redirectfd() utility function to redirect stdout without reassignment. Enhanced CI testing with musl support for better compatibility testing. Fixed bash completion symlinks for better installation. Made grepdiff test case PCRE-aware to handle different regex library configurations properly. Added manual pages for gitdiff, gitdiffview, svndiff, and svndiffview commands. Updated bash completions.
devel/patchutils: update to 0.4.2. 0.4.2 @twaugh twaugh released this on Jul 17 2020 Fixed a packaging issue. 0.4.0 @twaugh twaugh released this on Jul 16 2020 New patchview mode with accompanying scripts. New grepdiff option --only-match. New filterdiff option --remove-timestamps. Assorted other fixes and improvements.
initial import of patchutils-0.2.30 Patchutils is a small collection of programs that operate on patch files. Interdiff generates an incremental patch from two patches against a common source. For example, if you have applied a pre-patch to a source tree, and wish to apply another pre-patch (which is against the same original source tree), you can use interdiff to generate the patch that you need to apply. You can also use this to review changes between two pre-patches. Combinediff generates a single patch from two incremental patches, allowing you to merge patches together. The resulting patch file only alters each file once. Filterdiff will select the portions of a patch file that apply to files matching (or, alternatively, not matching) a shell wildcard. Fixcvsdiff is for correcting the output of 'cvs diff'. Rediff corrects hand-edited patches, by comparing the original patch with the modified one and adjusting the offsets and counts. Lsdiff displays a short listing of affected files in a patch file, along with (optionally) the line numbers of the start of each patch. Splitdiff separates out patches from a patch file so that each new patch file only alters any given file once. In this way, a file containing several incremental patches can be split into individual incremental patches. Grepdiff displays a list of the files modified by a patch where the patch contains a given regular expression. Recountdiff fixes up counts and offsets in a unified diff. Unwrapdiff fixes word-wrapped unified diffs.
Initial revision