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

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

Issue 411593003: Fix version check in push-to-trunk. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
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 | 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 self.ReadAndPersistVersion() 147 self.ReadAndPersistVersion()
148 self["trunk_version"] = self.ArrayToVersion("") 148 self["trunk_version"] = self.ArrayToVersion("")
149 149
150 if self["latest_build"] == "9999": # pragma: no cover 150 if self["latest_build"] == "9999": # pragma: no cover
151 # If version control on bleeding edge was switched off, just use the last 151 # If version control on bleeding edge was switched off, just use the last
152 # trunk version. 152 # trunk version.
153 self["latest_version"] = self["trunk_version"] 153 self["latest_version"] = self["trunk_version"]
154 154
155 if SortingKey(self["trunk_version"]) < SortingKey(self["latest_version"]): 155 if SortingKey(self["trunk_version"]) < SortingKey(self["latest_version"]):
156 # If the version on bleeding_edge is newer than on trunk, use it. 156 # If the version on bleeding_edge is newer than on trunk, use it.
157 self.GitCheckoutFile(self.Config(VERSION_FILE), "master") 157 self.GitCheckoutFile(self.Config(VERSION_FILE), "svn/bleeding_edge")
158 self.ReadAndPersistVersion() 158 self.ReadAndPersistVersion()
159 159
160 if self.Confirm(("Automatically increment BUILD_NUMBER? (Saying 'n' will " 160 if self.Confirm(("Automatically increment BUILD_NUMBER? (Saying 'n' will "
161 "fire up your EDITOR on %s so you can make arbitrary " 161 "fire up your EDITOR on %s so you can make arbitrary "
162 "changes. When you're done, save the file and exit your " 162 "changes. When you're done, save the file and exit your "
163 "EDITOR.)" % self.Config(VERSION_FILE))): 163 "EDITOR.)" % self.Config(VERSION_FILE))):
164 164
165 text = FileToText(self.Config(VERSION_FILE)) 165 text = FileToText(self.Config(VERSION_FILE))
166 text = MSub(r"(?<=#define BUILD_NUMBER)(?P<space>\s+)\d*$", 166 text = MSub(r"(?<=#define BUILD_NUMBER)(?P<space>\s+)\d*$",
167 r"\g<space>%s" % str(int(self["build"]) + 1), 167 r"\g<space>%s" % str(int(self["build"]) + 1),
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 CommitTrunk, 458 CommitTrunk,
459 SanityCheck, 459 SanityCheck,
460 CommitSVN, 460 CommitSVN,
461 TagRevision, 461 TagRevision,
462 CleanUp, 462 CleanUp,
463 ] 463 ]
464 464
465 465
466 if __name__ == "__main__": # pragma: no cover 466 if __name__ == "__main__": # pragma: no cover
467 sys.exit(PushToTrunk(CONFIG).Run()) 467 sys.exit(PushToTrunk(CONFIG).Run())
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