| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2014 the V8 project authors. All rights reserved. | 2 # Copyright 2014 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 | 61 |
| 62 def GitCheckout(self, name): | 62 def GitCheckout(self, name): |
| 63 assert name | 63 assert name |
| 64 self.Git(MakeArgs(["checkout -f", name])) | 64 self.Git(MakeArgs(["checkout -f", name])) |
| 65 | 65 |
| 66 @Strip | 66 @Strip |
| 67 def GitCurrentBranch(self): | 67 def GitCurrentBranch(self): |
| 68 for line in self.Git("status -s -b -uno").strip().splitlines(): | 68 for line in self.Git("status -s -b -uno").strip().splitlines(): |
| 69 match = re.match(r"^## (.+)", line) | 69 match = re.match(r"^## (.+)", line) |
| 70 if match: return match.group(1) | 70 if match: return match.group(1) |
| 71 raise Exception("Couldn't find curent branch.") | 71 raise Exception("Couldn't find curent branch.") # pragma: no cover |
| 72 | 72 |
| 73 @Strip | 73 @Strip |
| 74 def GitLog(self, n=0, format="", grep="", git_hash="", parent_hash="", | 74 def GitLog(self, n=0, format="", grep="", git_hash="", parent_hash="", |
| 75 branch="", reverse=False): | 75 branch="", reverse=False): |
| 76 assert not (git_hash and parent_hash) | 76 assert not (git_hash and parent_hash) |
| 77 args = ["log"] | 77 args = ["log"] |
| 78 if n > 0: | 78 if n > 0: |
| 79 args.append("-%d" % n) | 79 args.append("-%d" % n) |
| 80 if format: | 80 if format: |
| 81 args.append("--format=%s" % format) | 81 args.append("--format=%s" % format) |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 @Strip | 154 @Strip |
| 155 def GitSVNFindSVNRev(self, git_hash, branch=""): | 155 def GitSVNFindSVNRev(self, git_hash, branch=""): |
| 156 return self.Git(MakeArgs(["svn find-rev", git_hash, branch])) | 156 return self.Git(MakeArgs(["svn find-rev", git_hash, branch])) |
| 157 | 157 |
| 158 def GitSVNDCommit(self): | 158 def GitSVNDCommit(self): |
| 159 return self.Git("svn dcommit 2>&1", retry_on=lambda x: x is None) | 159 return self.Git("svn dcommit 2>&1", retry_on=lambda x: x is None) |
| 160 | 160 |
| 161 def GitSVNTag(self, version): | 161 def GitSVNTag(self, version): |
| 162 self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)), | 162 self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)), |
| 163 retry_on=lambda x: x is None) | 163 retry_on=lambda x: x is None) |
| OLD | NEW |