Fix git_cl diffstat to use -l100000 to match upload.py

Enables git to correctly detect copies and renames simultaneously.

BUG=144408


Review URL: https://chromiumcodereview.appspot.com/10915190

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@155899 0039d316-1c4b-4281-b951-d872f2087c98
experimental/szager/collated-output
iannucci@chromium.org 13 years ago
parent 7bf1b5dc72
commit 1512ab681a

@ -143,8 +143,8 @@ def print_stats(args):
if 'GIT_EXTERNAL_DIFF' in env:
del env['GIT_EXTERNAL_DIFF']
return subprocess2.call(
['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder'] + args,
env=env)
['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
'-l100000'] + args, env=env)
class Settings(object):

@ -115,7 +115,7 @@ class TestGitCl(TestCase):
((['git', 'log', '--pretty=format:%s%n%n%b', 'master...'],), 'foo'),
((['git', 'config', 'user.email'],), 'me@example.com'),
((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
'master...'],),
'-l100000', 'master...'],),
'+dat'),
((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],), 'desc\n'),
]
@ -193,7 +193,7 @@ class TestGitCl(TestCase):
def _dcommit_calls_3(cls):
return [
((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
'refs/remotes/origin/master', 'refs/heads/working'],),
'-l100000', 'refs/remotes/origin/master', 'refs/heads/working'],),
(' PRESUBMIT.py | 2 +-\n'
' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
(('About to commit; enter to confirm.',), None),
@ -354,7 +354,7 @@ class TestGitCl(TestCase):
((['git', 'log', '--pretty=format:%s%n%n%b', 'master...'],), 'foo'),
((['git', 'config', 'user.email'],), 'me@example.com'),
((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
'master...'],),
'-l100000', 'master...'],),
'+dat'),
]

Loading…
Cancel
Save