| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 | 178 |
| 179 def GitDiff(self, loc1, loc2): | 179 def GitDiff(self, loc1, loc2): |
| 180 return self.Git(MakeArgs(["diff", loc1, loc2])) | 180 return self.Git(MakeArgs(["diff", loc1, loc2])) |
| 181 | 181 |
| 182 def GitPull(self): | 182 def GitPull(self): |
| 183 self.Git("pull") | 183 self.Git("pull") |
| 184 | 184 |
| 185 def GitSVNFetch(self): | 185 def GitSVNFetch(self): |
| 186 self.Git("svn fetch") | 186 self.Git("svn fetch") |
| 187 | 187 |
| 188 def GitSVNRebase(self): |
| 189 self.Git("svn rebase") |
| 190 |
| 188 # TODO(machenbach): Unused? Remove. | 191 # TODO(machenbach): Unused? Remove. |
| 189 @Strip | 192 @Strip |
| 190 def GitSVNLog(self): | 193 def GitSVNLog(self): |
| 191 return self.Git("svn log -1 --oneline") | 194 return self.Git("svn log -1 --oneline") |
| 192 | 195 |
| 193 @Strip | 196 @Strip |
| 194 def GitSVNFindGitHash(self, revision, branch=""): | 197 def GitSVNFindGitHash(self, revision, branch=""): |
| 195 assert revision | 198 assert revision |
| 196 return self.Git(MakeArgs(["svn find-rev", "r%s" % revision, branch])) | 199 return self.Git(MakeArgs(["svn find-rev", "r%s" % revision, branch])) |
| 197 | 200 |
| 198 @Strip | 201 @Strip |
| 199 def GitSVNFindSVNRev(self, git_hash, branch=""): | 202 def GitSVNFindSVNRev(self, git_hash, branch=""): |
| 200 return self.Git(MakeArgs(["svn find-rev", git_hash, branch])) | 203 return self.Git(MakeArgs(["svn find-rev", git_hash, branch])) |
| 201 | 204 |
| 202 def GitSVNDCommit(self): | 205 def GitSVNDCommit(self): |
| 203 return self.Git("svn dcommit 2>&1", retry_on=lambda x: x is None) | 206 return self.Git("svn dcommit 2>&1", retry_on=lambda x: x is None) |
| 204 | 207 |
| 205 def GitSVNTag(self, version): | 208 def GitSVNTag(self, version): |
| 206 self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)), | 209 self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)), |
| 207 retry_on=lambda x: x is None) | 210 retry_on=lambda x: x is None) |
| OLD | NEW |