Remove the restriction to allow having both webrtc and talk changes in the same cl.

This restriction is no longer needed as the auto sync script can handle changes to both folder in same commit correctly.

BUG=
R=andrew@webrtc.org, henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15479006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6225 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
wu@webrtc.org 2014-05-22 22:35:46 +00:00
parent 0720758f9f
commit 10f871f29b

View File

@ -93,23 +93,6 @@ def _CheckApprovedFilesLintClean(input_api, output_api,
return result
def _CheckTalkOrWebrtcOnly(input_api, output_api):
base_folders = set(["webrtc", "talk"])
base_folders_in_cl = set()
for f in input_api.AffectedFiles():
full_path = f.LocalPath()
base_folders_in_cl.add(full_path[:full_path.find('/')])
results = []
if base_folders.issubset(base_folders_in_cl):
error_type = output_api.PresubmitError
results.append(error_type(
'It is not allowed to check in files to ' + ', '.join(base_folders) +
' in the same cl',
[]))
return results
def _CommonChecks(input_api, output_api):
"""Checks common to both upload and commit."""
# TODO(kjellander): Use presubmit_canned_checks.PanProjectChecks too.
@ -151,7 +134,6 @@ def _CommonChecks(input_api, output_api):
results.extend(_CheckApprovedFilesLintClean(input_api, output_api))
results.extend(_CheckNoIOStreamInHeaders(input_api, output_api))
results.extend(_CheckNoFRIEND_TEST(input_api, output_api))
results.extend(_CheckTalkOrWebrtcOnly(input_api, output_api))
return results
def CheckChangeOnUpload(input_api, output_api):