Ignore P4DIFF and DIFF in p4-revert#240
Open
alexhutcheson wants to merge 1 commit intogareth-rees:masterfrom
Open
Ignore P4DIFF and DIFF in p4-revert#240alexhutcheson wants to merge 1 commit intogareth-rees:masterfrom
alexhutcheson wants to merge 1 commit intogareth-rees:masterfrom
Conversation
p4-revert runs 'p4 diff' and expects a textual diff response. This assumption is violated if P4DIFF points to a graphical diff tool, which may not return a textual diff. The same behavior happens if P4DIFF is not set and DIFF points to a graphical diff tool, since p4 falls back to using DIFF. We fix this by clearing the P4DIFF and DIFF variables from the local environment before running 'p4 diff'. This behavior change only applies to the p4-revert function.
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
1 participant
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.
p4-revert runs 'p4 diff' and expects a textual diff response. This
assumption is violated if P4DIFF points to a graphical diff tool, which
may not return a textual diff. The same behavior happens if P4DIFF is not
set and DIFF points to a graphical diff tool, since p4 falls back to using
DIFF.
We fix this by clearing the P4DIFF and DIFF variables from the local
environment before running 'p4 diff'. This behavior change only applies
to the p4-revert function.
Fixes #239