Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Issue 14050007: Second take at handling users with locally overridden diff-cmds. (Closed)

Created:
7 years, 8 months ago by Peter Kasting
Modified:
7 years, 8 months ago
Reviewers:
M-A Ruel
CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, M-A Ruel, iannucci+depot_tools_chromium.org
Visibility:
Public.

Description

Second take at handling users with locally overridden diff-cmds. The first take at https://chromiumcodereview.appspot.com/14130006 tried to pass "--diff-cmd diff", which doesn't work for e.g. Windows cmd users who don't have a "diff" executable installed. This take instead passes the "--internal-diff" switch which tells svn to ignore any diff-cmd set locally and use its internal diff engine at all times. While implementing this I found that the existing code tried to work around this problem in a different way, by setting up a bogus config dir. Since that doesn't seem to work for me, and shouldn't be necessary with this patch anyway, removed that code. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=194990

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+69 lines, -91 lines) Patch
M scm.py View 3 chunks +69 lines, -91 lines 0 comments Download

Messages

Total messages: 8 (0 generated)
Peter Kasting
7 years, 8 months ago (2013-04-18 18:52:51 UTC) #1
M-A Ruel
lgtm
7 years, 8 months ago (2013-04-18 19:58:11 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pkasting@chromium.org/14050007/1
7 years, 8 months ago (2013-04-18 20:02:37 UTC) #3
commit-bot: I haz the power
Change committed as 194990
7 years, 8 months ago (2013-04-18 20:05:41 UTC) #4
Lei Zhang
$ svn diff --internal-diff svn: invalid option: --internal-diff Type 'svn help' for usage. $ svn ...
7 years, 8 months ago (2013-04-18 21:31:57 UTC) #5
iannucci
On 2013/04/18 21:31:57, Lei Zhang wrote: > $ svn diff --internal-diff > svn: invalid option: ...
7 years, 8 months ago (2013-04-18 21:36:17 UTC) #6
Peter Kasting
On 2013/04/18 21:31:57, Lei Zhang wrote: > svn, version 1.6.17 (r1128011) Sigh. Apparently --internal-diff is ...
7 years, 8 months ago (2013-04-18 21:37:07 UTC) #7
Peter Kasting
7 years, 8 months ago (2013-04-18 21:39:05 UTC) #8
Message was sent while issue was closed.
FYI, I reverted this in r195009.

Powered by Google App Engine
This is Rietveld 408576698