PATCHVIEW(1) | Man pages | PATCHVIEW(1) |
patchview - Without options, show numbered files modified by the patch. With options, behave as filterdiff.
patchview [[-n] | [--line-number]] [[-p n] | [--strip-match=n]] [--strip=n] [--addprefix=PREFIX] [[-s] | [--status]] [[-E] | [--empty-files-as-removed]] [[-i PATTERN] | [--include=PATTERN]] [[-x PATTERN] | [--exclude=PATTERN]] [[-z] | [--decompress]] [[-# RANGE] | [--hunks=RANGE]] [--lines=RANGE] [[-FRANGE] | [--files=RANGE]] [[-H] | [--with-filename]] [[-h] | [--no-filename]] [[-v] | [--verbose]...] [file...]
patchview {[--help] | [--version] | [--filter ...] | [--grep ...]}
So what is patchview? It is a wrapper of filterdiff for use with numbered files.
patchview
(without args) is equivalent to: lsdiff --number
patchview -F2-
(or with any other args) is equivalent to: filterdiff -F2- (or whatever arguments are supplied)
There are two scripts for working with git (gitdiff and gitdiffview) and two for svn (svndiff and svndiffview).
svndiff
gitdiff
(without args) will give the list of files modified
svndiff -F1
gitdiff -F1
will show the patch of file #1
svndiffview
gitdiffview
pipe all patches through filterdiff to vim - -R (in read-only mode, easy to quit), showing complete patch with color.
svndiffview -F2
gitdiffview -F2
(or any other args) will pipe patch of file #2 to vim - -R
-n, --line-number
For each file that is modified, a line is generated containing the line number of the beginning of the patch, followed by a Tab character, followed by the name of the file that is modified. If -v is given once, following each of these lines will be one line for each hunk, consisting of a Tab character, the line number that the hunk begins at, another Tab character, the string “Hunk #”, and the hunk number (starting at 1).
If the -v is given twice in conjunction with -n (i.e. -nvv), the format is slightly different: hunk-level descriptive text is shown after each hunk number, and the --number-files option is enabled.
-N, --number-files
-# RANGE, --hunks=RANGE
--lines=RANGE
-F=RANGE, --files=RANGE
-p n, --strip-match=n
--strip=n
--addprefix=PREFIX
-s, --status
-E, --empty-files-as-removed
-i PATTERN, --include=PATTERN
-x PATTERN, --exclude=PATTERN
-z, --decompress
-H, --with-filename
-h, --no-filename
-v, --verbose
--help
--version
--filter
--grep
We can make the following one-line script with the name difftotrunk.sh, to view the differences of two directories or svn repos (trunk and .)
diff ../trunk . -ru -x .svn | patchview "$@"
./difftotrunk.sh , will show all different files and his number.
./difftotrunk.sh -F3,4 , will show the differences of files #3 and #4 only.
./difftotrunk.sh -F3 -#1 , will show only hunk #1 of file #3.
./difftotrunk.sh -F3 -#x1 , will show the differences of files #3 without hunk #1 (x means that exclude).
Tim Waugh <twaugh@redhat.com>
02 Jul 2020 | patchutils |