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 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
363 self.step.Git("rebase %s" % remote) | 363 self.step.Git("rebase %s" % remote) |
364 self.step.GitSVNTag(tag) | 364 self.step.GitSVNTag(tag) |
365 | 365 |
366 | 366 |
367 class GitTagsOnlyMixin(VCInterface): | 367 class GitTagsOnlyMixin(VCInterface): |
368 def Pull(self): | 368 def Pull(self): |
369 self.step.GitPull() | 369 self.step.GitPull() |
370 | 370 |
371 def Fetch(self): | 371 def Fetch(self): |
372 self.step.Git("fetch") | 372 self.step.Git("fetch") |
| 373 self.step.GitSVNFetch() |
373 | 374 |
374 def GetTags(self): | 375 def GetTags(self): |
375 return self.step.Git("tag").strip().splitlines() | 376 return self.step.Git("tag").strip().splitlines() |
376 | 377 |
377 def GetBranches(self): | 378 def GetBranches(self): |
378 # Get relevant remote branches, e.g. "branch-heads/3.25". | 379 # Get relevant remote branches, e.g. "branch-heads/3.25". |
379 branches = filter( | 380 branches = filter( |
380 lambda s: re.match(r"^branch\-heads/\d+\.\d+$", s), | 381 lambda s: re.match(r"^branch\-heads/\d+\.\d+$", s), |
381 self.step.GitRemotes()) | 382 self.step.GitRemotes()) |
382 # Remove 'branch-heads/' prefix. | 383 # Remove 'branch-heads/' prefix. |
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
883 for (number, step_class) in enumerate(step_classes): | 884 for (number, step_class) in enumerate(step_classes): |
884 steps.append(MakeStep(step_class, number, self._state, self._config, | 885 steps.append(MakeStep(step_class, number, self._state, self._config, |
885 options, self._side_effect_handler)) | 886 options, self._side_effect_handler)) |
886 for step in steps[options.step:]: | 887 for step in steps[options.step:]: |
887 if step.Run(): | 888 if step.Run(): |
888 return 0 | 889 return 0 |
889 return 0 | 890 return 0 |
890 | 891 |
891 def Run(self, args=None): | 892 def Run(self, args=None): |
892 return self.RunSteps(self._Steps(), args) | 893 return self.RunSteps(self._Steps(), args) |
OLD | NEW |