Skip to content

Commit

Permalink
Version info and document update for 0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
ymattw committed Mar 24, 2013
1 parent 850cfd1 commit 56eb7bc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGES
Expand Up @@ -2,6 +2,12 @@
Change log
==========

Version 0.9 (2013-03-23)

- Supports reading context diff via ``filterdiff`` (patchutils)
- Fixed a diff parser bug which misread git commit message as common line
- Lots of code refactor

Version 0.8 (2013-03-13)

- Parser is now robust enough to handle dangling headers and short patch
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -46,7 +46,7 @@ profile3:

clean:
rm -f MANIFEST profile*.tmp* .coverage
rm -rf build/ cdiff.egg-info/ dist/ __pycache__/
rm -rf build/ cdiff.egg-info/ dist/ __pycache__/ htmlcov/

build:
./setup.py build sdist
Expand Down
9 changes: 5 additions & 4 deletions README.rst
Expand Up @@ -73,7 +73,7 @@ Type ``cdiff -h`` to show usage:
-s, --side-by-side enable side-by-side mode
-w N, --width=N set text width for side-by-side mode, default is 80
-l, --log show log with changes from revision control
-c X, --color=X colorize mode 'auto' (default), 'always', or 'never'
-c M, --color=M colorize mode 'auto' (default), 'always', or 'never'
Read diff from local modification in a *Git/Mercurial/Svn* workspace (output
from e.g. ``git diff``, ``svn diff``):
Expand Down Expand Up @@ -113,9 +113,9 @@ Pipe in a diff:
# 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 < foo.path" works too.
# major Linux distros and MacPorts.
#
cat foo.patch | cdiff
cdiff -s < foo.patch
Redirect output to another patch file is safe:

Expand All @@ -136,7 +136,8 @@ Cdiff has following known issues:
Pull requests are very welcome, please make sure your changes can pass unit
tests and regression tests by run ``make test`` (required tool *coverage* can
be installed with ``pip install coverage``). Also watch out `travis build
<https://travis-ci.org/ymattw/cdiff>`_ after push, make sure it passes as well.
<https://travis-ci.org/ymattw/cdiff/pull_requests>`_ after push, make sure it
passes as well.

See also
--------
Expand Down
4 changes: 2 additions & 2 deletions cdiff.py
Expand Up @@ -8,7 +8,7 @@
"""

META_INFO = {
'version' : '0.8',
'version' : '0.9',
'license' : 'BSD-3',
'author' : 'Matthew Wang',
'email' : 'mattwyl(@)gmail(.)com',
Expand Down Expand Up @@ -662,7 +662,7 @@ def main():
'-l', '--log', action='store_true',
help='show log with changes from revision control')
parser.add_option(
'-c', '--color', default='auto', metavar='X',
'-c', '--color', default='auto', metavar='M',
help="""colorize mode 'auto' (default), 'always', or 'never'""")
opts, args = parser.parse_args()

Expand Down

0 comments on commit 56eb7bc

Please sign in to comment.