Matthew Wang
bdb65ad6a1
Merge pull request #35 from rakuco/respect-LESS-env-var
Respect the `LESS' environment variable.
11 gadus atpakaļ
Raphael Kubo da Costa
db3bc92bed
Respect the `LESS' environment variable.
Steal a few more lines from git's pager code and only pass the hardcoded
"-FRSX" flags if the user has not set the LESS environmen variable to some
other variable, thus behaving more closely to what the user would expect.
11 gadus atpakaļ
Matthew Wang
f85a5e2b20
Merge pull request #34 from myint/stream
Remove obsolete code
11 gadus atpakaļ
Steven Myint
790373dcb3
Remove obsolete code
11 gadus atpakaļ
Matthew Wang
eef3b0f97a
Merge pull request #33 from myint/latin1
Handle Latin-1 encoded text in diffs
11 gadus atpakaļ
Steven Myint
095740253c
Handle Latin-1 encoded text in diffs
This is useful for avoiding crashing on "cdiff -l" (on Python 3) in
https://github.com/myint/cppclean.
Also handle unknown encodings gracefully rather than crashing.
11 gadus atpakaļ
Matthew Wang
bc2b4bf5db
Version bumped up to 0.9.3
11 gadus atpakaļ
Matthew Wang
61d9e93b7b
Remove unused 'os'
11 gadus atpakaļ
Matthew Wang
d44d437758
Merge branch 'block-select-line-buffered'
11 gadus atpakaļ
Matthew Wang
1755970048
Adjust Popen object creation order to fix issue #30
Have to create pager Popen object before the translator Popen object
in PatchStreamForwarder, otherwise the `stdin=subprocess.PIPE` would cause
trouble to the translator pipe (select() never see EOF after input stream
ended), most likely python bug 12607 (http://bugs.python.org/issue12607)
which was fixed in python 2.7.3.
11 gadus atpakaļ
Matthew Wang
2d2815a228
Update: try for issue #30 works for python >= 2.7.3
11 gadus atpakaļ
Matthew Wang
12efc9d2c7
Implement next() for Python 2.5
11 gadus atpakaļ
Matthew Wang
d4ed688e5c
Another try for issue #30
blocking mode with select() and bufsize=1, buggy in python 2.x:
close() does not notify select() for EOF
11 gadus atpakaļ
Matthew Wang
c2f3622c8a
Lazy fix #32 by set default encoding to utf-8
11 gadus atpakaļ
Matthew Wang
46d9e21076
Fix an unit test fails in python 2.5 for issue #31
11 gadus atpakaļ
Matthew Wang
73e8e660b4
Fix issue #31 by catching UnicodeDecodeError as well
11 gadus atpakaļ
Matthew Wang
e83642c799
Use file object's .closed instead of _istream_open
11 gadus atpakaļ
Matthew Wang
551350d81d
Merge pull request #29 from myint/master
Remove code made unnecessary by #28
11 gadus atpakaļ
Steven Myint
d3032476c1
Remove code made unnecessary by #28
11 gadus atpakaļ
Steven Myint
2cb541c957
Handle all keyboard interrupts more completely
Also handle abruptly closed pipe gracefully.
11 gadus atpakaļ
Matthew Wang
380d074426
Screenshots now hosted in branch 'gh-pages'
11 gadus atpakaļ
Matthew Wang
74edd18cfe
Fix screenshot link
11 gadus atpakaļ
Matthew Wang
af8a8eb48d
Version bumped to 0.9.2
11 gadus atpakaļ
Matthew Wang
f0b2f43ad8
More example to illustrate command options
11 gadus atpakaļ
Matthew Wang
5f671d7bdd
Show extra help message after option list
Use OptionGroup for hack
11 gadus atpakaļ
Matthew Wang
57e62f2a7c
Stop on first unknown option and pass them down
- Close issue #26 (user can now use cdiff -s -U5 --cached)
11 gadus atpakaļ
Matthew Wang
e19f384ba4
Fix issue #23 with --no-ext-diff
Use `--no-ext-diff` to disable GIT_EXTERNAL_DIFF and diff.external which might
break cdiff output
11 gadus atpakaļ
Matthew Wang
ec3b4fe9ec
Merge pull request #24 from killarny/patch-1
Temporarily unset GIT_EXTERNAL_DIFF when invoking git diff.
11 gadus atpakaļ
killarny
bcb99110bd
Temporarily unset GIT_EXTERNAL_DIFF when invoking git diff.
When the git diff command is customized through setting GIT_EXTERNAL_DIFF in the environment, the output of cdiff is broken and defaults to the output of the tool git has been configured to use.
Temporarily unsetting this variable when cdiff invokes git diff fixes the issue.
11 gadus atpakaļ
Matthew Wang
e5a43b60b6
Pypi does not like bar '.. code::' directive
11 gadus atpakaļ
Matthew Wang
56eb7bce95
Version info and document update for 0.9
11 gadus atpakaļ
Matthew Wang
850cfd1ecb
Fix duplicate explicit target name
- Pypi requires strict reStructuredText syntax
- New make target `doc-check`
11 gadus atpakaļ
Matthew Wang
04ac895387
Refactor to make logic clearer, no DiffOps anymore
If need to support normal diff, writing a ndiff to udiff translator
makes more sense
11 gadus atpakaļ
Matthew Wang
ab9a9981c6
Enhance diff parser on handling hunk links, fix #20
11 gadus atpakaļ
Matthew Wang
18985c1ca2
Doc update for context diff support
11 gadus atpakaļ
Matthew Wang
91c9df1f4e
Re-enable context diff related tests
11 gadus atpakaļ
Steven Myint
c7cd2237cb
Install patchutils on Travis CI
11 gadus atpakaļ
Matthew Wang
5ece3ada9b
Skip a context diff related unit test as Travis not ready
11 gadus atpakaļ
Matthew Wang
183fa49118
Travis does not have filterdiff, not ready to add context test case yet (#15 )
11 gadus atpakaļ
Matthew Wang
e7854dddde
Support context diff via filterdiff, fixed #15
11 gadus atpakaļ
Matthew Wang
9cc9298c0f
https does not really work with distutils (at least python 2.7)
11 gadus atpakaļ
Matthew Wang
2e49a7eb3f
Fall through unknown format to 'unified', fixed #18
11 gadus atpakaļ
Matthew Wang
d81f755e4e
Merge remote-tracking branch 'origin/context-diff'
11 gadus atpakaļ
Steven Myint
5ddd06fd05
Handle a diff with only an svn property change
11 gadus atpakaļ
Matthew Wang
b87376fac9
Should tolerate dos format
11 gadus atpakaļ
Matthew Wang
69e4b1683e
Probe context diff for #15
11 gadus atpakaļ
Matthew Wang
7881a41f69
- Naming enhancement for unified diff
11 gadus atpakaļ
Matthew Wang
b6a591a6ce
Version bump up to 0.8
11 gadus atpakaļ
Matthew Wang
e191e54ea6
Fixed #14 by tolerating dangling headers and short patch < 4 lines
11 gadus atpakaļ
Matthew Wang
6a6249f4c6
Dirty fix false alarm of dangling header reported in issue #14
11 gadus atpakaļ