Matt Wang
ba7dea407c
Rename to ydiff (version 1.1)
6 jaren geleden
Matt Wang
31c3213ad0
Refactor: init DiffMarker object with flags.
Do not test internal methods.
6 jaren geleden
Matt Wang
1ba4bc8f02
Simplify list generating code with style updates.
- Use single quotes
- No more backslashes at line end
6 jaren geleden
Dmitry Frank
cac52eae4e
Optimize output
Remove workarounds added while implementing --wrap, so that redundand
trailing sequences like `\x1b[32m\x1b[0m` are removed.
Also, actually run wrap regression tests; it should have been done in
the --wrap commit but somehow slipped away while addressing PR comments.
6 jaren geleden
Dmitry Frank
507e736ccb
Implement --wrap flag
Which causes long lines to be nicely wrapped in side-by-side mode. To be
used primarily with `-s -w0`.
6 jaren geleden
Leeor Aharon
11d2e1556a
added an argument to control tab expansion
7 jaren geleden
Matthew Wang
911bc91c6a
Bump up version to 1.0
7 jaren geleden
Matthew Wang
f3fe271a35
Fix #59 with env variable CDIFF_OPTIONS
7 jaren geleden
Matthew Wang
1a433ff5d7
Implement pep8 check
Excludes E203 whitespace before ':' for now.
TODO: look into pep8 for why `# nopep8` does not work here
8 jaren geleden
Matthew Wang
4ab62ce0bd
Update for 0.9.8
8 jaren geleden
Matthew Wang
f246c518de
Fix issue #25 w/ logic to recogonize old/new path
9 jaren geleden
Matthew Wang
7bf5bec0fc
Fix default old/new address when they are missing
9 jaren geleden
Matthew Wang
2cf37af55e
Bump up version
9 jaren geleden
Matthew Wang
10fa1e838a
Fix issue 44: unexpected side-by-side output for diff of diff
Common error of using lstrip:
lstrip('\x00+') will eat all '+' after '\x00'
9 jaren geleden
Matthew Wang
9d7c723102
No more lightgreen, it's unreadable in solarized color scheme
People complains lightgreen is nearly unreadable in solarized dark color
scheme. Use green instead, which looks good enough for both
10 jaren geleden
Matthew Wang
121c28bc35
Version 0.9.6 Fix TypeError exception in auto width logic
10 jaren geleden
Steven Myint
18b3b85be7
Use correct integer division
Without this, we get the following on Python 3:
return '%s%*s' % (markup_fn(text), pad_len, '')
TypeError: * wants int
10 jaren geleden
Matthew Wang
1aeaf771b1
Version bump up to 0.9.5
10 jaren geleden
Matthew Wang
c95c027f3e
Enable smooth horizontal scrolling with less option `--shift 1`
10 jaren geleden
Matthew Wang
a5b4e5ebf0
Usage update for --width=0
10 jaren geleden
Matthew Wang
01af713f55
Auto setup line width once num_width is known
10 jaren geleden
Matthew Wang
ac439e26ed
Remove win32 support for detecting terminal size
10 jaren geleden
Fabien Meghazi
6befc2a7bf
Add terminal size fit for side by side view
10 jaren geleden
Matthew Wang
9266fb7cdd
Version bump up to 0.9.4
10 jaren geleden
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 jaren geleden
Steven Myint
790373dcb3
Remove obsolete code
11 jaren geleden
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 jaren geleden
Matthew Wang
bc2b4bf5db
Version bumped up to 0.9.3
11 jaren geleden
Matthew Wang
61d9e93b7b
Remove unused 'os'
11 jaren geleden
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 jaren geleden
Matthew Wang
2d2815a228
Update: try for issue #30 works for python >= 2.7.3
11 jaren geleden
Matthew Wang
12efc9d2c7
Implement next() for Python 2.5
11 jaren geleden
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 jaren geleden
Matthew Wang
c2f3622c8a
Lazy fix #32 by set default encoding to utf-8
11 jaren geleden
Matthew Wang
73e8e660b4
Fix issue #31 by catching UnicodeDecodeError as well
11 jaren geleden
Matthew Wang
e83642c799
Use file object's .closed instead of _istream_open
11 jaren geleden
Steven Myint
d3032476c1
Remove code made unnecessary by #28
11 jaren geleden
Steven Myint
2cb541c957
Handle all keyboard interrupts more completely
Also handle abruptly closed pipe gracefully.
11 jaren geleden
Matthew Wang
af8a8eb48d
Version bumped to 0.9.2
11 jaren geleden
Matthew Wang
5f671d7bdd
Show extra help message after option list
Use OptionGroup for hack
11 jaren geleden
Matthew Wang
57e62f2a7c
Stop on first unknown option and pass them down
- Close issue #26 (user can now use cdiff -s -U5 --cached)
11 jaren geleden
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 jaren geleden
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 jaren geleden
Matthew Wang
56eb7bce95
Version info and document update for 0.9
11 jaren geleden
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 jaren geleden
Matthew Wang
ab9a9981c6
Enhance diff parser on handling hunk links, fix #20
11 jaren geleden
Matthew Wang
e7854dddde
Support context diff via filterdiff, fixed #15
11 jaren geleden
Matthew Wang
2e49a7eb3f
Fall through unknown format to 'unified', fixed #18
11 jaren geleden
Steven Myint
5ddd06fd05
Handle a diff with only an svn property change
11 jaren geleden
Matthew Wang
b87376fac9
Should tolerate dos format
11 jaren geleden