| 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 if message: | 126 if message: |
| 127 args += ["-am", Quoted(message)] | 127 args += ["-am", Quoted(message)] |
| 128 self.Git(MakeArgs(args)) | 128 self.Git(MakeArgs(args)) |
| 129 | 129 |
| 130 def GitPresubmit(self): | 130 def GitPresubmit(self): |
| 131 self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"") | 131 self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"") |
| 132 | 132 |
| 133 def GitDCommit(self): | 133 def GitDCommit(self): |
| 134 self.Git("cl dcommit -f --bypass-hooks", retry_on=lambda x: x is None) | 134 self.Git("cl dcommit -f --bypass-hooks", retry_on=lambda x: x is None) |
| 135 | 135 |
| 136 def GitDiff(self, loc1, loc2, exclude=None): | 136 def GitDiff(self, loc1, loc2): |
| 137 exclude = exclude or [] | 137 return self.Git(MakeArgs(["diff", loc1, loc2])) |
| 138 files = self.Git(MakeArgs(["diff", "--name-only", loc1, loc2])) | |
| 139 files = filter(lambda f: f not in exclude, files.strip().splitlines()) | |
| 140 return self.Git(MakeArgs(["diff", loc1, loc2] + files)) | |
| 141 | 138 |
| 142 def GitPull(self): | 139 def GitPull(self): |
| 143 self.Git("pull") | 140 self.Git("pull") |
| 144 | 141 |
| 145 def GitSVNFetch(self): | 142 def GitSVNFetch(self): |
| 146 self.Git("svn fetch") | 143 self.Git("svn fetch") |
| 147 | 144 |
| 148 @Strip | 145 @Strip |
| 149 def GitSVNLog(self): | 146 def GitSVNLog(self): |
| 150 return self.Git("svn log -1 --oneline") | 147 return self.Git("svn log -1 --oneline") |
| 151 | 148 |
| 152 @Strip | 149 @Strip |
| 153 def GitSVNFindGitHash(self, revision, branch=""): | 150 def GitSVNFindGitHash(self, revision, branch=""): |
| 154 assert revision | 151 assert revision |
| 155 return self.Git(MakeArgs(["svn find-rev", "r%s" % revision, branch])) | 152 return self.Git(MakeArgs(["svn find-rev", "r%s" % revision, branch])) |
| 156 | 153 |
| 157 @Strip | 154 @Strip |
| 158 def GitSVNFindSVNRev(self, git_hash, branch=""): | 155 def GitSVNFindSVNRev(self, git_hash, branch=""): |
| 159 return self.Git(MakeArgs(["svn find-rev", git_hash, branch])) | 156 return self.Git(MakeArgs(["svn find-rev", git_hash, branch])) |
| 160 | 157 |
| 161 def GitSVNDCommit(self): | 158 def GitSVNDCommit(self): |
| 162 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) |
| 163 | 160 |
| 164 def GitSVNTag(self, version): | 161 def GitSVNTag(self, version): |
| 165 self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)), | 162 self.Git(("svn tag %s -m \"Tagging version %s\"" % (version, version)), |
| 166 retry_on=lambda x: x is None) | 163 retry_on=lambda x: x is None) |
| OLD | NEW |