Add svn support, plus some misc fixes #28
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As an example, svn defaults to adding `-u` to external diff tool invocations.
Most diff programs use --unified to specify number of lines of context, so might as well align with the de-facto standard.
This new option allows labelling each of the files being diff'd with arbitrary strings instead of just showing the file paths. This also completes the basic funcionality to support using icdiff as an external diff tool for svn.
|
This would fix issue #19 |
| @@ -406,7 +425,8 @@ def start(): | |||
| parser.add_option("--no-headers", default=False, | |||
| action="store_true", | |||
| help="don't label the left and right sides with their file names") | |||
| parser.add_option("--numlines", default=5, | |||
| parser.add_option("-U", "--unified", default=5, | |||
There was a problem hiding this comment.
Can we keep support for --numlines as well, for people who've been using that?
jeffkaufman
added a commit
that referenced
this pull request
Dec 11, 2014
* Changed `--version` to use the optparse builtin support for it; * Changed `--numlines` to `--unified` because most diff tools use the latter for specifing number of context lines; * Added `-u` and `-L` to support svn calls to external diff tools. The `-u` is a dummy option; it's there so that option parsing doesn't choke whenever it is used. This is compatible with svn and git. Squash-merge of pharaujo's work in #28.
|
Merged as ab6b6f8 |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
--versionto use the optparse builtin support for it;--numlinesto--unifiedbecause most diff tools use the latter for specifing number of context lines;-uand-Lto support svn calls to external diff tools.The
-uis a dummy option; it's there so that option parsing doesn't choke whenever it is used. This is compatible with svn and git.