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 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
364 # Remove 'origin/branch-heads/' prefix. | 364 # Remove 'origin/branch-heads/' prefix. |
365 return map(lambda s: s[20:], branches) | 365 return map(lambda s: s[20:], branches) |
366 | 366 |
367 def RemoteMasterBranch(self): | 367 def RemoteMasterBranch(self): |
368 return "origin/master" | 368 return "origin/master" |
369 | 369 |
370 def RemoteCandidateBranch(self): | 370 def RemoteCandidateBranch(self): |
371 return "origin/candidates" | 371 return "origin/candidates" |
372 | 372 |
373 def RemoteBranch(self, name): | 373 def RemoteBranch(self, name): |
| 374 if name in ["candidates", "master"]: |
| 375 return "origin/%s" % name |
374 return "origin/branch-heads/%s" % name | 376 return "origin/branch-heads/%s" % name |
375 | 377 |
376 | 378 |
377 class GitReadSvnWriteInterface(GitReadOnlyMixin, GitSvnInterface): | 379 class GitReadSvnWriteInterface(GitReadOnlyMixin, GitSvnInterface): |
378 pass | 380 pass |
379 | 381 |
380 | 382 |
381 VC_INTERFACES = { | 383 VC_INTERFACES = { |
382 "git_svn": GitSvnInterface, | 384 "git_svn": GitSvnInterface, |
383 "git_read_svn_write": GitReadSvnWriteInterface, | 385 "git_read_svn_write": GitReadSvnWriteInterface, |
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
834 for (number, step_class) in enumerate(step_classes): | 836 for (number, step_class) in enumerate(step_classes): |
835 steps.append(MakeStep(step_class, number, self._state, self._config, | 837 steps.append(MakeStep(step_class, number, self._state, self._config, |
836 options, self._side_effect_handler)) | 838 options, self._side_effect_handler)) |
837 for step in steps[options.step:]: | 839 for step in steps[options.step:]: |
838 if step.Run(): | 840 if step.Run(): |
839 return 0 | 841 return 0 |
840 return 0 | 842 return 0 |
841 | 843 |
842 def Run(self, args=None): | 844 def Run(self, args=None): |
843 return self.RunSteps(self._Steps(), args) | 845 return self.RunSteps(self._Steps(), args) |
OLD | NEW |