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

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

Issue 136793005: Fix tree check for push-to-trunk. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 11 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 | 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 class CommitRepository(Step): 232 class CommitRepository(Step):
233 MESSAGE = "Commit to the repository." 233 MESSAGE = "Commit to the repository."
234 234
235 def RunStep(self): 235 def RunStep(self):
236 self.WaitForLGTM() 236 self.WaitForLGTM()
237 # Re-read the ChangeLog entry (to pick up possible changes). 237 # Re-read the ChangeLog entry (to pick up possible changes).
238 # FIXME(machenbach): This was hanging once with a broken pipe. 238 # FIXME(machenbach): This was hanging once with a broken pipe.
239 TextToFile(GetLastChangeLogEntries(self.Config(CHANGELOG_FILE)), 239 TextToFile(GetLastChangeLogEntries(self.Config(CHANGELOG_FILE)),
240 self.Config(CHANGELOG_ENTRY_FILE)) 240 self.Config(CHANGELOG_ENTRY_FILE))
241 241
242 if self.Git("cl dcommit -f", "PRESUBMIT_TREE_CHECK=\"skip\"") is None: 242 if self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"") is None:
243 self.Die("'git cl presubmit' failed, please try again.")
244
245 if self.Git("cl dcommit -f --bypass-hooks") is None:
243 self.Die("'git cl dcommit' failed, please try again.") 246 self.Die("'git cl dcommit' failed, please try again.")
244 247
245 248
246 class StragglerCommits(Step): 249 class StragglerCommits(Step):
247 MESSAGE = ("Fetch straggler commits that sneaked in since this script was " 250 MESSAGE = ("Fetch straggler commits that sneaked in since this script was "
248 "started.") 251 "started.")
249 252
250 def RunStep(self): 253 def RunStep(self):
251 if self.Git("svn fetch") is None: 254 if self.Git("svn fetch") is None:
252 self.Die("'git svn fetch' failed.") 255 self.Die("'git svn fetch' failed.")
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 def Main(): 579 def Main():
577 parser = BuildOptions() 580 parser = BuildOptions()
578 (options, args) = parser.parse_args() 581 (options, args) = parser.parse_args()
579 if not ProcessOptions(options): 582 if not ProcessOptions(options):
580 parser.print_help() 583 parser.print_help()
581 return 1 584 return 1
582 RunPushToTrunk(CONFIG, PushToTrunkOptions(options)) 585 RunPushToTrunk(CONFIG, PushToTrunkOptions(options))
583 586
584 if __name__ == "__main__": 587 if __name__ == "__main__":
585 sys.exit(Main()) 588 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