| OLD | NEW |
| 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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 return "origin/candidates" | 332 return "origin/candidates" |
| 333 | 333 |
| 334 def RemoteBranch(self, name): | 334 def RemoteBranch(self, name): |
| 335 # Assume that if someone "fully qualified" the ref, they know what they | 335 # Assume that if someone "fully qualified" the ref, they know what they |
| 336 # want. | 336 # want. |
| 337 if name.startswith('refs/'): | 337 if name.startswith('refs/'): |
| 338 return name | 338 return name |
| 339 if name in ["candidates", "master"]: | 339 if name in ["candidates", "master"]: |
| 340 return "refs/remotes/origin/%s" % name | 340 return "refs/remotes/origin/%s" % name |
| 341 # Check if branch is in heads. | 341 # Check if branch is in heads. |
| 342 if self.Git("show-ref refs/remotes/origin/%s" % name).strip(): | 342 if self.step.Git("show-ref refs/remotes/origin/%s" % name).strip(): |
| 343 return "refs/remotes/origin/%s" % name | 343 return "refs/remotes/origin/%s" % name |
| 344 # Check if branch is in branch-heads. | 344 # Check if branch is in branch-heads. |
| 345 if self.Git("show-ref refs/remotes/branch-heads/%s" % name).strip(): | 345 if self.step.Git("show-ref refs/remotes/branch-heads/%s" % name).strip(): |
| 346 return "refs/remotes/branch-heads/%s" % name | 346 return "refs/remotes/branch-heads/%s" % name |
| 347 self.Die("Can't find remote of %s" % name) | 347 self.Die("Can't find remote of %s" % name) |
| 348 | 348 |
| 349 def Tag(self, tag, remote, message): | 349 def Tag(self, tag, remote, message): |
| 350 # Wait for the commit to appear. Assumes unique commit message titles (this | 350 # Wait for the commit to appear. Assumes unique commit message titles (this |
| 351 # is the case for all automated merge and push commits - also no title is | 351 # is the case for all automated merge and push commits - also no title is |
| 352 # the prefix of another title). | 352 # the prefix of another title). |
| 353 commit = None | 353 commit = None |
| 354 for wait_interval in [3, 7, 15, 35, 45, 60]: | 354 for wait_interval in [3, 7, 15, 35, 45, 60]: |
| 355 self.step.Git("fetch") | 355 self.step.Git("fetch") |
| (...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 883 for (number, step_class) in enumerate([BootstrapStep] + step_classes): | 883 for (number, step_class) in enumerate([BootstrapStep] + step_classes): |
| 884 steps.append(MakeStep(step_class, number, self._state, self._config, | 884 steps.append(MakeStep(step_class, number, self._state, self._config, |
| 885 options, self._side_effect_handler)) | 885 options, self._side_effect_handler)) |
| 886 for step in steps[options.step:]: | 886 for step in steps[options.step:]: |
| 887 if step.Run(): | 887 if step.Run(): |
| 888 return 0 | 888 return 0 |
| 889 return 0 | 889 return 0 |
| 890 | 890 |
| 891 def Run(self, args=None): | 891 def Run(self, args=None): |
| 892 return self.RunSteps(self._Steps(), args) | 892 return self.RunSteps(self._Steps(), args) |
| OLD | NEW |