cdiff 1.0

安装

使用量

键入cdiff -h以显示用法：

$ cdiff -h
Usage: cdiff [options] [file|dir ...]

View colored, incremental diff in a workspace or from stdin, with side by side
and auto pager support

Options:
  --version           show program's version number and exit
  -h, --help          show this help message and exit
  -s, --side-by-side  enable side-by-side mode
  -w N, --width=N     set text width for side-by-side mode, 0 for auto
                      detection, default is 80
  -l, --log           show log with changes from revision control
  -c M, --color=M     colorize mode 'auto' (default), 'always', or 'never'

  Note:
    Option parser will stop on first unknown option and pass them down to
    underneath revision control. Environment variable CDIFF_OPTIONS may be
    used to specify default options that will be placed at the beginning
    of the argument list.

从git/mercurial/svn工作区中的本地修改读取diff（输出 例如git diff，svn diff）：

cd proj-workspace
cdiff                       # view colored incremental diff
cdiff -s                    # view side by side, use default text width 80
cdiff -s -w 90# use text width 90 other than default 80
cdiff -s -w 0# auto set text width based on terminal size
cdiff -s file1 dir2         # view modification of given files/dirs only
cdiff -s -w90 -- -U10       # pass '-U10' to underneath revision diff tool
cdiff -s -w90 -U10          # '--' is optional as it's unknown to cdiff
cdiff -s --cached           # show git staged diff (git diff --cached)
cdiff -s -r1234             # show svn diff to revision 1234

在git/mercurial/svn工作区中读取包含更改的日志（例如 git log -p，svn log --diff，注意–diff选项是SVN 1.7.0中的新选项：

cd proj-workspace
cdiff -l                    # read log along with changes
cdiff -ls                   # equivalent to cdiff -l -s, view side by side
cdiff -ls -w90              # set text width 90 as well
cdiff -ls file1 dir2        # see log with changes of given files/dirs only

环境变量CDIFF_OPTIONS可用于指定默认选项 将放在参数列表的开头，例如：

exportCDIFF_OPTIONS='-s -w0'
cdiff foo                   # equivalent to "cdiff -s -w0 foo"

如果您更喜欢使用git cdiff这样的命令来触发 cdiff命令，您可以将可执行文件符号链接到一个名为git-cdiff 如下所示：

cdiff_dir=$(dirname $(which cdiff))
ln -s "${cdiff_dir}/cdiff""${cdiff_dir}/git-cdiff"

管道压差：

git log -p -2 | cdiff       # view git log with changes of last 2 commits
git show 15bfa | cdiff -s   # view a given git commit, side by side
svn diff -r1234 | cdiff -s  # view svn diff comparing to given revision
diff -u file1 file2 | cdiff # view diff between two files (note the '-u')
diff -ur dir1 dir2 | cdiff  # view diff between two dirs
# View diff in a GitHub pull request, side by side
curl https://github.com/ymattw/cdiff/pull/11.diff | cdiff -s

# View a patch file in unified or context format, the latter depends on
# command `filterdiff` from package `patchutils` which is available in
# major Linux distros and MacPorts.
#
cdiff -s < foo.patch

将输出重定向到另一个修补程序文件是安全的：

svn diff -r PREV | cdiff -s > my.patch

注释

CDIFF有以下已知问题：

• 不识别normaldiff，取决于filterdiff（patchutils） 阅读上下文
• 并排模式对宽字符有对齐问题
• 终端可能遇到了一个混乱的异常（键入reset可以修复它）

非常欢迎拉取请求，请确保您的更改可以通过单元 运行make test（必需的工具coverage可以进行测试和回归测试 使用pip install coverage安装。还要小心travis build 推完之后，确保它也通过了。

另见

我有另一个工具coderev，它为代码生成并排的diff页面 从两个给定的文件或目录中查看，我发现扩展到 支持git-so-inventedcdiff。ANSI颜色标记的概念也来自 项目colordiff。