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

Side by Side Diff: tools/push-to-trunk/push_to_trunk.py

Issue 72703002: Fixed blocking dcommit in push-to-trunk script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | tools/push-to-trunk/test_scripts.py » ('j') | 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/env python 1 #!/usr/bin/env python
2 # Copyright 2013 the V8 project authors. All rights reserved. 2 # Copyright 2013 the V8 project authors. All rights reserved.
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following 10 # copyright notice, this list of conditions and the following
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 def __init__(self): 217 def __init__(self):
218 Step.__init__(self, "Commit to the repository.") 218 Step.__init__(self, "Commit to the repository.")
219 219
220 def RunStep(self): 220 def RunStep(self):
221 self.WaitForLGTM() 221 self.WaitForLGTM()
222 # Re-read the ChangeLog entry (to pick up possible changes). 222 # Re-read the ChangeLog entry (to pick up possible changes).
223 # FIXME(machenbach): This was hanging once with a broken pipe. 223 # FIXME(machenbach): This was hanging once with a broken pipe.
224 TextToFile(GetLastChangeLogEntries(self.Config(CHANGELOG_FILE)), 224 TextToFile(GetLastChangeLogEntries(self.Config(CHANGELOG_FILE)),
225 self.Config(CHANGELOG_ENTRY_FILE)) 225 self.Config(CHANGELOG_ENTRY_FILE))
226 226
227 if self.Git("cl dcommit -v", "PRESUBMIT_TREE_CHECK=\"skip\"") is None: 227 if self.Git("cl dcommit -f", "PRESUBMIT_TREE_CHECK=\"skip\"") is None:
228 self.Die("'git cl dcommit' failed, please try again.") 228 self.Die("'git cl dcommit' failed, please try again.")
229 229
230 230
231 class StragglerCommits(Step): 231 class StragglerCommits(Step):
232 def __init__(self): 232 def __init__(self):
233 Step.__init__(self, "Fetch straggler commits that sneaked in since this " 233 Step.__init__(self, "Fetch straggler commits that sneaked in since this "
234 "script was started.") 234 "script was started.")
235 235
236 def RunStep(self): 236 def RunStep(self):
237 if self.Git("svn fetch") is None: 237 if self.Git("svn fetch") is None:
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 def Main(): 575 def Main():
576 parser = BuildOptions() 576 parser = BuildOptions()
577 (options, args) = parser.parse_args() 577 (options, args) = parser.parse_args()
578 if not ProcessOptions(options): 578 if not ProcessOptions(options):
579 parser.print_help() 579 parser.print_help()
580 return 1 580 return 1
581 RunScript(CONFIG, options) 581 RunScript(CONFIG, options)
582 582
583 if __name__ == "__main__": 583 if __name__ == "__main__":
584 sys.exit(Main()) 584 sys.exit(Main())
OLDNEW
« no previous file with comments | « no previous file | tools/push-to-trunk/test_scripts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698