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

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

Issue 199993005: Fix branch for resetting change log in push-to-trunk. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 9 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 | « tools/push-to-trunk/git_recipes.py ('k') | 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 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 Command("rm", "-f %s*" % self.Config(PATCH_FILE)) 311 Command("rm", "-f %s*" % self.Config(PATCH_FILE))
312 312
313 313
314 class AddChangeLog(Step): 314 class AddChangeLog(Step):
315 MESSAGE = "Add ChangeLog changes to trunk branch." 315 MESSAGE = "Add ChangeLog changes to trunk branch."
316 316
317 def RunStep(self): 317 def RunStep(self):
318 # The change log has been modified by the patch. Reset it to the version 318 # The change log has been modified by the patch. Reset it to the version
319 # on trunk and apply the exact changes determined by this PrepareChangeLog 319 # on trunk and apply the exact changes determined by this PrepareChangeLog
320 # step above. 320 # step above.
321 self.GitCheckoutFile(self.Config(CHANGELOG_FILE)) 321 self.GitCheckoutFile(self.Config(CHANGELOG_FILE), "svn/trunk")
322 changelog_entry = FileToText(self.Config(NEW_CHANGELOG_FILE)) 322 changelog_entry = FileToText(self.Config(NEW_CHANGELOG_FILE))
323 old_change_log = FileToText(self.Config(CHANGELOG_FILE)) 323 old_change_log = FileToText(self.Config(CHANGELOG_FILE))
324 new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log) 324 new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log)
325 TextToFile(new_change_log, self.Config(CHANGELOG_FILE)) 325 TextToFile(new_change_log, self.Config(CHANGELOG_FILE))
326 os.remove(self.Config(NEW_CHANGELOG_FILE)) 326 os.remove(self.Config(NEW_CHANGELOG_FILE))
327 327
328 328
329 class SetVersion(Step): 329 class SetVersion(Step):
330 MESSAGE = "Set correct version for trunk." 330 MESSAGE = "Set correct version for trunk."
331 331
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 SwitchChromium, 554 SwitchChromium,
555 UpdateChromiumCheckout, 555 UpdateChromiumCheckout,
556 UploadCL, 556 UploadCL,
557 SwitchV8, 557 SwitchV8,
558 CleanUp, 558 CleanUp,
559 ] 559 ]
560 560
561 561
562 if __name__ == "__main__": # pragma: no cover 562 if __name__ == "__main__": # pragma: no cover
563 sys.exit(PushToTrunk(CONFIG).Run()) 563 sys.exit(PushToTrunk(CONFIG).Run())
OLDNEW
« no previous file with comments | « tools/push-to-trunk/git_recipes.py ('k') | tools/push-to-trunk/test_scripts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698