p4.el icon indicating copy to clipboard operation
p4.el copied to clipboard

Ignore P4DIFF and DIFF in p4-revert

Open alexhutcheson opened this issue 7 years ago • 0 comments

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

alexhutcheson avatar Nov 29 '17 21:11 alexhutcheson