View colored, incremental diff in workspace or from stdin, with side by side and auto pager support
Project description
Cdiff
Term based tool to view colored, incremental diff in Git/Mercurial/Svn workspace or from stdin, with side by side and auto pager support. Requires python (>= 2.5.0) and less.
Installation
Install with pip
Cdiff is already listed on PyPI, you can install with pip if you have the tool.
pip install --upgrade cdiff
Install with setup.py
You can also run the setup.py from the source if you don’t have pip.
git clone https://github.com/ymattw/cdiff.git
cd cdiff
./setup.py install
Download directly
Just save 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/cdiff.py > ~/bin/cdiff
chmod +x ~/bin/cdiff
Usage
Show usage:
cdiff -h
Read diff from local modification in a Git/Mercurial/Svn workspace:
cd proj-workspace
cdiff # view colored incremental diff
cdiff -s # view side by side
cdiff -s -w 90 # use text width 90 other than default 80
cdiff -s file1 dir2 # view modification of given files/dirs only
Read the log with changes (e.g. git log -p, svn log --diff) in a Git/Mercurial/Svn workspace (note –diff option is new in svn 1.7.0):
cd proj-workspace
cdiff -l
cdiff -ls # equivalent to cdiff -l -s
cdiff -ls -w90
cdiff -ls file1 dir2 # see log with changes of given files/dirs only
Pipe in a diff:
git log -p -2 | cdiff -s # view git log with changes of last 2 commits
git show 15bfa | cdiff -s # view a git commit
svn diff -r1234 | cdiff -s # view svn diff comparing to given revision
cdiff < foo.patch # view a patch file (unified format only)
cat foo.patch | cdiff # same as above
diff -u foo bar | cdiff # pipe in diff between two files (note the '-u')
diff -ur dir1 dir2 | cdiff # pipe in diff between two dirs
Redirect output to another patch file is safe:
svn diff -r PREV | cdiff -s > my.patch
Notes
Verified on travis with python 2.5, 2.6, 2.7, 3.2, 3.3 and pypy
Only takes unified diff for input
Side by side mode has alignment problem for wide chars
Pull requests are very welcome, run make test to verify (required tool coverage can be installed with pip install coverage)
See also
I have another tool coderev which generates side-by-side diff pages for code review from two given files or directories, I found it’s not easy to extend to support git so invented cdiff. Idea of ansi color markup is also from project colordiff.
Change log
Version 0.7 (2013-02-23)
Support reading diff or log for given files/dirs in workspace
Support diff generated from diff -ru dir1 dir2
Usage change: reading a patch and comparing two files need stdin redirect
Version 0.6 (2013-02-20)
A few performance tuning and code clean up
Add unit test cases with coverage 70%
Show merge history in svn log
Version 0.5.1 (2013-02-19)
Fixed incorrect yield on diff missing eof
Fixed a bug in diff format probe
Handle keyboard interrupt and large diffs in non-color mode
Code clean up
Version 0.5 (2013-02-18)
Support read output from svn diff --log and hg log -p
Streamline reading large patch set
New --log (-l) option to read revision control diff log (thanks to Steven Myint)
Version 0.4 (2013-02-16)
New option -c WHEN (–color WHEN) to support auto test
Auto regression test now on Travis
Version 0.3 (2013-02-07)
Support compare two files (wrapper of diff)
Version 0.2 (2013-02-06)
Move cdiff.py to top dir for better meta info management
Version 0.1 (2013-02-05)
New –version option
setup.py now read version from source code
Version 0.0.4 (2013-02-04)
Add CHANGES for history track and better versioning
Version 0.0.3 (2013-02-04)
Publish on PyPI, supports read patch from file, pipe and diff output from revision tools (thanks to Steven Myint)
Project details
Release history Release notifications | RSS feed
Download files
Download the file for your platform. If you're not sure which to choose, learn more about installing packages.