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

Unified Diff: scm.py

Issue 14130006: Explicitly pass "--diff-cmd diff" to "svn diff", for users who have set some other diff tool. (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/depot_tools/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scm.py
===================================================================
--- scm.py (revision 177805)
+++ scm.py (working copy)
@@ -803,7 +803,8 @@
@staticmethod
def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):
"""Grabs the diff data."""
- command = ["diff", "--config-dir", bogus_dir, filename]
+ command = ["diff", "--diff-cmd", "diff", "--config-dir", bogus_dir,
+ filename]
if revision:
command.extend(['--revision', revision])
data = None
@@ -915,7 +916,8 @@
# revision the file was deleted.
srcinfo = {'Revision': rev}
if (srcinfo.get('Revision') != rev and
- SVN.Capture(['diff', '-r', '%d:head' % rev, srcurl], cwd)):
+ SVN.Capture(['diff', '--diff-cmd', 'diff', '-r',
+ '%d:head' % rev, srcurl], cwd)):
metaheaders.append("#$ svn cp -r %d %s %s "
"### WARNING: note non-trunk copy\n" %
(rev, src, filename))
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698