Commit 8a6ebcec authored by hinoka@chromium.org's avatar hinoka@chromium.org

Don't pass in --revision into gclient sync on the DEPS sync in apply_issue.py if git

We changed apply_issue to stage the patch if its on git, so it doesn't make sense to pass in --revision because that causes gclient to run solutions in managed mode.

BUG=388374

Review URL: https://codereview.chromium.org/359443003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@280855 0039d316-1c4b-4281-b951-d872f2087c98
parent e84ac911
...@@ -235,17 +235,17 @@ def main(): ...@@ -235,17 +235,17 @@ def main():
print( print(
'A DEPS file was updated inside a gclient checkout, running gclient ' 'A DEPS file was updated inside a gclient checkout, running gclient '
'sync.') 'sync.')
base_rev = 'BASE' if scm_type == 'svn' else 'HEAD'
gclient_path = os.path.join(BASE_DIR, 'gclient') gclient_path = os.path.join(BASE_DIR, 'gclient')
if sys.platform == 'win32': if sys.platform == 'win32':
gclient_path += '.bat' gclient_path += '.bat'
with annotated_gclient.temp_filename(suffix='gclient') as f: with annotated_gclient.temp_filename(suffix='gclient') as f:
cmd = [ cmd = [
gclient_path, 'sync', gclient_path, 'sync',
'--revision', base_rev,
'--nohooks', '--nohooks',
'--delete_unversioned_trees', '--delete_unversioned_trees',
] ]
if scm_type == 'svn':
cmd.extend(['--revision', 'BASE'])
if options.revision_mapping: if options.revision_mapping:
cmd.extend(['--output-json', f]) cmd.extend(['--output-json', f])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment