Merged
Conversation
Use SvnStreamWrapper instead of AprStreamFile to implement this.
* Use Null Stream (System::IO::Stream::Null) instead of creating new MemoryStream if no ErrorSteam are set.
Member
|
Subversions diff can be rerouted to an external diff command. This command only works properly if there is really a file handle behind the stream. (Subversions obtains the backing handle via a private Api in this case) |
Contributor
Author
|
Does SharpSvn support an external diff command? Because, as I found, the diff cmd property resets in the Could I solve the problem by adding check of |
Member
|
Sure, if you check for the safe case then we can go this route. |
Create an instance of AprStreamFile if the diff_cmd is specified, or SvnStreamWrapper if diff_cmd is null. The external diff tool (specified via diff_cmd) supports only file streams, while libsvn_diff supports both (file stream and SvnStream). * Diff.cpp (SvnClient::Diff): Add a check of diff_cmd for null. (SvnClient::Diff): Move the body of the diff command to the SvnClient::InternalDiff() function. (SvnClient::InternalDiff): Move the body of the diff command here. * SvnClient.h (InternalDiff): Add a declaration of the InternalDiff() function.
* src/SharpSvn/Commands/Diff.cpp
* Revert change in code format which is unrelated; Replace
`svn_error_t* r` with `svn_error_t *r` (space position changed).
Contributor
Author
|
I think I am done with implementation of the check for Thanks! |
Contributor
Author
|
@rhuijben Did you see my new commits? |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This pull-request does little fixes in the Diff command.