patchutils 0.3.1 (Stable branch)


 
Thread Tools Search this Thread
Special Forums News, Links, Events and Announcements Software Releases - RSS News patchutils 0.3.1 (Stable branch)
# 1  
Old 01-23-2009
patchutils 0.3.1 (Stable branch)

Patchutils contains a collection of tools formanipulating patch files: interdiff, combinediff,flipdiff, filterdiff, fixcvsdiff, rediff, lsdiff, grepdiff,splitdiff, recountdiff, and unwrapdiff. You canuse interdiff to create an incremental patchbetween two patches that are against a commonsource tree, combinediff for creating acumulative diff from two incremental patches, andflipdiff to transpose two incremental patches.Filterdiff is for extracting or excluding patchesfrom a patch set based on modified files matchingshell wildcards. Lsdiff lists modified files in apatch. Rediff, recountdiff, and unwrapdiff correcthand-edited (or otherwise broken) patches.License: GNU General Public License (GPL)Changes:
The TMPDIR environment variable is now respected. A rediff assertion failure has been fixed. The editdiff program now retains marker comments. GNU-style long names are now available for most options.Image

Image

More...
Login or Register to Ask a Question

Previous Thread | Next Thread
Login or Register to Ask a Question
GREPDIFF(1)							     Man pages							       GREPDIFF(1)

NAME
grepdiff - show files modified by a diff containing a regex SYNOPSIS
grepdiff [[-n] | [--line-number]] [--number-files] [[-p n] | [--strip-match=n]] [--strip=n] [--addprefix=PREFIX] [[-s] | [--status]] [[-i PATTERN] | [--include=PATTERN]] [[-x PATTERN] | [--exclude=PATTERN]] [[-v] | [--verbose]] [[-E] | [--extended-regexp]] [[-H] | [--with-filename]] [[-h] | [--no-filename]] [--output-matching=WHAT] {[REGEX] | [-f FILE]} [file...] grepdiff {[--help] | [--version] | [--list] | [--filter ...]} DESCRIPTION
For each file modified by a patch, if the patch hunk contains the REGEX then the file's name is printed. The regular expression is treated as POSIX Basic Regular Expression syntax, unless the -E option is given in which case POSIX Extended Regular Expression syntax is used. For example, to see the patches in my.patch which contain the regular expression "pf_gfp_mask", use: grepdiff pf_gfp_mask my.patch | xargs -rn1 filterdiff my.patch -i You can use both unified and context format diffs with this program. OPTIONS
-n, --line-number Display the line number that each patch begins at. If verbose output is requested, each matching hunk is listed as well. For a description of the output format see lsdiff(1). --number-files File numbers are listed, beginning at 1, before each filename. -p n, --strip-match=n When matching, ignore the first n components of the pathname. --strip=n Remove the first n components of the pathname before displaying it. --addprefix=PREFIX Prefix the pathname with PREFIX before displaying it. -s Show file additions, modifications and removals. A file addition is indicated by a "+", a removal by a "-", and a modification by a "!". -i PATTERN, --include=PATTERN Include only files matching PATTERN. -x PATTERN --exclude=PATTERN Exclude files matching PATTERN. -E, --extended-regexp Use POSIX Extended Regular Expression syntax. -H, --with-filename Print the name of the patch file containing each match. -h, --no-filename Suppress the name of the patch file containing each match. -f FILE, --file=FILE Read regular expressions from FILE, one per line. --output-matching=hunk|file Display the matching hunk-level or file-level diffs. --help Display a short usage message. --version Display the version number of grepdiff. --filter Behave like filterdiff(1) instead. --list Behave like lsdiff(1) instead. SEE ALSO
filterdiff(1), lsdiff(1) AUTHOR
Tim Waugh <twaugh@redhat.com> Package maintainer patchutils 23 Jan 2009 GREPDIFF(1)