From 832179b72bc8616ba501ff42d7f7048a1ca57c71 Mon Sep 17 00:00:00 2001 From: "johnnyg@chromium.org" Date: Thu, 17 Sep 2009 17:13:24 +0000 Subject: [PATCH] Fix git-try so that it modifies the ---/+++ headers for new files correctly. Review URL: http://codereview.chromium.org/213004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@26452 0039d316-1c4b-4281-b951-d872f2087c98 --- git-try | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git-try b/git-try index 9b1964f0e..8d8babd91 100755 --- a/git-try +++ b/git-try @@ -62,10 +62,10 @@ def GetRietveldPatchsetNumber(): 'branch.%s.rietveldpatchset' % GetBranchName()]) -def GetMungedDiff(branch): +def GetMungedDiff(branch, prefix='src/'): """Get the diff we'll send to the try server. We munge paths to match svn.""" # Make the following changes: - # - Prepend "src/" to paths as svn is expecting + # - Prepend "src/" (or some other prefix) to paths as svn is expecting # - In the case of added files, replace /dev/null with the path to the file # being added. output = [] @@ -78,9 +78,9 @@ def GetMungedDiff(branch): for i in range(len(diff)): line = diff[i] if line.startswith('--- /dev/null'): - line = '--- %s' % diff[i+1][4:] + line = '--- %s' % prefix + diff[i+1][4:] elif line.startswith('--- ') or line.startswith('+++ '): - line = line[0:4] + 'src/' + line[4:] + line = line[0:4] + prefix + line[4:] output.append(line) munged_diff = ''.join(output)