netvor
/
ydiff
Tarkkaile 1
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 23 Wiki Activity
23 Commitit
1 Haara
Puu: f9c4553bef
Branchit Tagit
${ item.name }
Create branch ${ searchTerm }
from 'f9c4553bef'
${ noResults }
ydiff
Matthew Wang f9c4553bef ignore EPIPE happens when input patch set is large 12 vuotta sitten
img document update; images 12 vuotta sitten
src ignore EPIPE happens when input patch set is large 12 vuotta sitten
tests fix crlf problem; update doc and test make targets 12 vuotta sitten
.gitignore gitignore and doc update 12 vuotta sitten
COPYING initial revision 12 vuotta sitten
Makefile More fix after merge pull request from @myint to support python3 (issue #2) 12 vuotta sitten
README.md raw image url broken, use pages instead 12 vuotta sitten

README.md

About

View colored diff in unified-diff format or side-by-side mode with auto pager. Requires Python (>= 2.5.0) and less.

Default Side-by-side

Installation

Save src/cdiff.py to whatever directory which is in your $PATH, for example, $HOME/bin is in my $PATH, so I save the script there and name as cdiff.

curl -ksS https://raw.github.com/ymattw/cdiff/master/src/cdiff.py > ~/bin/cdiff
chmod +x ~/bin/cdiff

Usage

Just give it a diff (patch) file or pipe a diff to it. Use option -s for side-by-side view, and option -w <N> to use text width other than default 80. See examples below

View a diff (patch) file:

cdiff foo.patch           # view colored udiff
cdiff foo.patch -s        # side-by-side
cdiff foo.patch -s -w 90  # use text width 90 other than default 80

Read diff from svn:

svn diff | cdiff
svn diff | cdiff -s
svn diff | cdiff -s -w 90

Read diff from git:

git diff | cdiff -s
git log -p -2 | cdiff -s
git show <commit> | cdiff -s

Redirect output to another patch file is safe:

svn diff | cdiff -s > my.patch

Known issue

  • Only support unified format for input diff
  • Side-by-side mode has alignment problem for wide chars