70 lines
2.7 KiB
Groff
70 lines
2.7 KiB
Groff
.\"-
|
|
.\" Copyright (c) 2000 Eivind Eklund
|
|
.\" All rights reserved.
|
|
.\"
|
|
.\" Redistribution and use in source and binary forms, with or without
|
|
.\" modification, are permitted provided that the following conditions
|
|
.\" are met:
|
|
.\" 1. Redistributions of source code must retain the above copyright
|
|
.\" notice, this list of conditions and the following disclaimer
|
|
.\" in this position and unchanged.
|
|
.\" 2. Redistributions in binary form must reproduce the above copyright
|
|
.\" notice, this list of conditions and the following disclaimer in the
|
|
.\" documentation and/or other materials provided with the distribution.
|
|
.\" 3. The name of the author may not be used to endorse or promote products
|
|
.\" derived from this software without specific prior written permission.
|
|
.\"
|
|
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
.\"
|
|
.\" $FreeBSD$
|
|
.\"
|
|
.Dd October 24, 2000
|
|
.Dt CDIFF 1
|
|
.Sh NAME
|
|
.Nm cdiff
|
|
.Nd show diffs with colors
|
|
.Sh SYNOPSIS
|
|
.Nm cdiff
|
|
.Op Ar diff ...
|
|
.Sh DESCRIPTION
|
|
.Nm
|
|
reads a unidiff or context diff from stdin or a set of (optionally compressed)
|
|
files and URLs, adds color codes, expands tabs to 8 spaces, and passes the
|
|
results to
|
|
.Xr less 1 .
|
|
If used on a color terminal, it makes diffs much easier to read.
|
|
There is also handling of "cvs annotate" in it.
|
|
.Sh AUTHORS
|
|
.Nm
|
|
was written by
|
|
.An Eivind Eklund Aq eivind@FreeBSD.org .
|
|
based on a sed line somebody passed around. The code is (much) smaller than
|
|
this man page.
|
|
.Sh SEE ALSO
|
|
.Xr diff 1 ,
|
|
.Xr less 1 ,
|
|
.Xr cvs 1 .
|
|
.Sh BUGS
|
|
.Nm
|
|
assumes standard ANSI color escape sequences (as used by xterm and most other
|
|
commonly used terminals), rather than using
|
|
.Xr curses 3 .
|
|
.Pp
|
|
.Nm
|
|
should really be a large and complex C program based on
|
|
.Xr less 1
|
|
and a diff library. This would allow a more informative display, including
|
|
collapsing pure deletions/insertions inside a single line to one line with
|
|
colors for deleted/added material, avoiding the line-wrap problems in less
|
|
due to less not knowing the effects or lengths of the color escape codes,
|
|
and correct handling of shifted tabs (instead of just expanding them to
|
|
spaces.)
|