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

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

Issue 607893004: Add tag write access to merge script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Review. Created 6 years, 2 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/merge_to_branch.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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 278
279 # Remove indentation and merge paragraphs into single long lines, keeping 279 # Remove indentation and merge paragraphs into single long lines, keeping
280 # empty lines between them. 280 # empty lines between them.
281 def SplitMapJoin(split_text, fun, join_text): 281 def SplitMapJoin(split_text, fun, join_text):
282 return lambda text: join_text.join(map(fun, text.split(split_text))) 282 return lambda text: join_text.join(map(fun, text.split(split_text)))
283 strip = lambda line: line.strip() 283 strip = lambda line: line.strip()
284 text = SplitMapJoin("\n\n", SplitMapJoin("\n", strip, " "), "\n\n")(text) 284 text = SplitMapJoin("\n\n", SplitMapJoin("\n", strip, " "), "\n\n")(text)
285 285
286 if not text: # pragma: no cover 286 if not text: # pragma: no cover
287 self.Die("Commit message editing failed.") 287 self.Die("Commit message editing failed.")
288 self["commit_title"] = text.splitlines()[0]
288 TextToFile(text, self.Config("COMMITMSG_FILE")) 289 TextToFile(text, self.Config("COMMITMSG_FILE"))
289 290
290 291
291 class NewBranch(Step): 292 class NewBranch(Step):
292 MESSAGE = "Create a new branch from trunk." 293 MESSAGE = "Create a new branch from trunk."
293 294
294 def RunStep(self): 295 def RunStep(self):
295 self.GitCreateBranch(self.Config("TRUNKBRANCH"), 296 self.GitCreateBranch(self.Config("TRUNKBRANCH"),
296 self.vc.RemoteCandidateBranch()) 297 self.vc.RemoteCandidateBranch())
297 298
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 MESSAGE = "Commit to SVN." 355 MESSAGE = "Commit to SVN."
355 356
356 def RunStep(self): 357 def RunStep(self):
357 result = self.vc.Land() 358 result = self.vc.Land()
358 359
359 360
360 class TagRevision(Step): 361 class TagRevision(Step):
361 MESSAGE = "Tag the new revision." 362 MESSAGE = "Tag the new revision."
362 363
363 def RunStep(self): 364 def RunStep(self):
364 self.vc.Tag(self["version"], self.vc.RemoteCandidateBranch()) 365 self.vc.Tag(
366 self["version"], self.vc.RemoteCandidateBranch(), self["commit_title"])
365 367
366 368
367 class CleanUp(Step): 369 class CleanUp(Step):
368 MESSAGE = "Done!" 370 MESSAGE = "Done!"
369 371
370 def RunStep(self): 372 def RunStep(self):
371 print("Congratulations, you have successfully created the trunk " 373 print("Congratulations, you have successfully created the trunk "
372 "revision %s." 374 "revision %s."
373 % self["version"]) 375 % self["version"])
374 376
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 CommitTrunk, 442 CommitTrunk,
441 SanityCheck, 443 SanityCheck,
442 CommitSVN, 444 CommitSVN,
443 TagRevision, 445 TagRevision,
444 CleanUp, 446 CleanUp,
445 ] 447 ]
446 448
447 449
448 if __name__ == "__main__": # pragma: no cover 450 if __name__ == "__main__": # pragma: no cover
449 sys.exit(PushToTrunk().Run()) 451 sys.exit(PushToTrunk().Run())
OLDNEW
« no previous file with comments | « tools/push-to-trunk/merge_to_branch.py ('k') | tools/push-to-trunk/test_scripts.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698