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

Side by Side Diff: deps2git.py

Issue 372193004: Make deps2git sync v8 bleeding_edge correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/deps2git.git@master
Patch Set: Created 6 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """Convert SVN based DEPS into .DEPS.git for use with NewGit.""" 6 """Convert SVN based DEPS into .DEPS.git for use with NewGit."""
7 7
8 import collections 8 import collections
9 from cStringIO import StringIO 9 from cStringIO import StringIO
10 import json 10 import json
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 refspec = 'refs/heads/master' 115 refspec = 'refs/heads/master'
116 else: 116 else:
117 refspec = 'refs/remotes/origin/master' 117 refspec = 'refs/remotes/origin/master'
118 118
119 # Work-around for: 119 # Work-around for:
120 # http://code.google.com/p/chromium/issues/detail?id=362222 120 # http://code.google.com/p/chromium/issues/detail?id=362222
121 if (git_url.startswith('https://chromium.googlesource.com/external/pefile') 121 if (git_url.startswith('https://chromium.googlesource.com/external/pefile')
122 and int(svn_rev) in (63, 141)): 122 and int(svn_rev) in (63, 141)):
123 return '72c6ae42396cb913bcab63c15585dc3b5c3f92f1' 123 return '72c6ae42396cb913bcab63c15585dc3b5c3f92f1'
124 124
125 # Work-around for crbug.com/391270, bleeding_edge is a local branch.
126 if (git_url.startswith('https://chromium.googlesource.com/external/v8')
127 and svn_branch_name == 'bleeding_edge'):
128 refspec = 'bleeding_edge'
129
125 return git_tools.Search(git_repo_path, svn_rev, mirror, refspec, git_url) 130 return git_tools.Search(git_repo_path, svn_rev, mirror, refspec, git_url)
126 131
127 132
128 def MessageMain(message_q, threads): 133 def MessageMain(message_q, threads):
129 while True: 134 while True:
130 try: 135 try:
131 msg = message_q.get(True, 10) 136 msg = message_q.get(True, 10)
132 except Queue.Empty: 137 except Queue.Empty:
133 print >> sys.stderr, 'Still working on:' 138 print >> sys.stderr, 'Still working on:'
134 for s in sorted([th.working_on for th in threads if th.working_on]): 139 for s in sorted([th.working_on for th in threads if th.working_on]):
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 return 0 426 return 0
422 427
423 # Write the DEPS file to disk. 428 # Write the DEPS file to disk.
424 deps_utils.WriteDeps(options.out, deps_vars, results.new_deps, deps_os, 429 deps_utils.WriteDeps(options.out, deps_vars, results.new_deps, deps_os,
425 include_rules, skip_child_includes, hooks) 430 include_rules, skip_child_includes, hooks)
426 return 0 431 return 0
427 432
428 433
429 if '__main__' == __name__: 434 if '__main__' == __name__:
430 sys.exit(main()) 435 sys.exit(main())
OLDNEW
« 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