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

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

Issue 653533003: Fix remote branch location in releases script (2). (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: 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 | « no previous file | no next file » | 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 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 390
391 def RemoteMasterBranch(self): 391 def RemoteMasterBranch(self):
392 return "origin/master" 392 return "origin/master"
393 393
394 def RemoteCandidateBranch(self): 394 def RemoteCandidateBranch(self):
395 return "origin/candidates" 395 return "origin/candidates"
396 396
397 def RemoteBranch(self, name): 397 def RemoteBranch(self, name):
398 if name in ["candidates", "master"]: 398 if name in ["candidates", "master"]:
399 return "origin/%s" % name 399 return "origin/%s" % name
400 return "origin/branch-heads/%s" % name 400 return "branch-heads/%s" % name
401 401
402 def Tag(self, tag, remote, message): 402 def Tag(self, tag, remote, message):
403 # Wait for the commit to appear. Assumes unique commit message titles (this 403 # Wait for the commit to appear. Assumes unique commit message titles (this
404 # is the case for all automated merge and push commits - also no title is 404 # is the case for all automated merge and push commits - also no title is
405 # the prefix of another title). 405 # the prefix of another title).
406 commit = None 406 commit = None
407 for wait_interval in [3, 7, 15, 35]: 407 for wait_interval in [3, 7, 15, 35]:
408 self.step.Git("fetch") 408 self.step.Git("fetch")
409 commit = self.step.GitLog(n=1, format="%H", grep=message, branch=remote) 409 commit = self.step.GitLog(n=1, format="%H", grep=message, branch=remote)
410 if commit: 410 if commit:
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 for (number, step_class) in enumerate(step_classes): 880 for (number, step_class) in enumerate(step_classes):
881 steps.append(MakeStep(step_class, number, self._state, self._config, 881 steps.append(MakeStep(step_class, number, self._state, self._config,
882 options, self._side_effect_handler)) 882 options, self._side_effect_handler))
883 for step in steps[options.step:]: 883 for step in steps[options.step:]:
884 if step.Run(): 884 if step.Run():
885 return 0 885 return 0
886 return 0 886 return 0
887 887
888 def Run(self, args=None): 888 def Run(self, args=None):
889 return self.RunSteps(self._Steps(), args) 889 return self.RunSteps(self._Steps(), args)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698