Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Side by Side Diff: tools/release/git_recipes.py

Issue 1398033003: [Release] Update merge script to leverage auto-tag bot (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Truncate title more meaningful Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | tools/release/merge_to_branch.py » ('j') | tools/release/merge_to_branch.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 args += ["--author", "\"%s <%s>\"" % (author, author)] 235 args += ["--author", "\"%s <%s>\"" % (author, author)]
236 self.Git(MakeArgs(args), **kwargs) 236 self.Git(MakeArgs(args), **kwargs)
237 237
238 def GitPresubmit(self, **kwargs): 238 def GitPresubmit(self, **kwargs):
239 self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"", **kwargs) 239 self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"", **kwargs)
240 240
241 def GitCLLand(self, **kwargs): 241 def GitCLLand(self, **kwargs):
242 self.Git( 242 self.Git(
243 "cl land -f --bypass-hooks", retry_on=lambda x: x is None, **kwargs) 243 "cl land -f --bypass-hooks", retry_on=lambda x: x is None, **kwargs)
244 244
245 def GitCLAddComment(self, message, **kwargs):
246 args = ["cl", "comments", "-a", Quoted(message)]
247 self.Git(MakeArgs(args), **kwargs)
248
245 def GitDiff(self, loc1, loc2, **kwargs): 249 def GitDiff(self, loc1, loc2, **kwargs):
246 return self.Git(MakeArgs(["diff", loc1, loc2]), **kwargs) 250 return self.Git(MakeArgs(["diff", loc1, loc2]), **kwargs)
247 251
248 def GitPull(self, **kwargs): 252 def GitPull(self, **kwargs):
249 self.Git("pull", **kwargs) 253 self.Git("pull", **kwargs)
250 254
251 def GitFetchOrigin(self, *refspecs, **kwargs): 255 def GitFetchOrigin(self, *refspecs, **kwargs):
252 self.Git(MakeArgs(["fetch", "origin"] + list(refspecs)), **kwargs) 256 self.Git(MakeArgs(["fetch", "origin"] + list(refspecs)), **kwargs)
253 257
254 @Strip 258 @Strip
(...skipping 21 matching lines...) Expand all
276 value = footer_map.get(GIT_SVN_ID_FOOTER_KEY) 280 value = footer_map.get(GIT_SVN_ID_FOOTER_KEY)
277 if value: 281 if value:
278 match = GIT_SVN_ID_RE.match(value) 282 match = GIT_SVN_ID_RE.match(value)
279 if match: 283 if match:
280 return match.group(1) 284 return match.group(1)
281 raise GitFailedException("Couldn't determine commit position for %s" % 285 raise GitFailedException("Couldn't determine commit position for %s" %
282 git_hash) 286 git_hash)
283 287
284 def GitGetHashOfTag(self, tag_name, **kwargs): 288 def GitGetHashOfTag(self, tag_name, **kwargs):
285 return self.Git("rev-list -1 " + tag_name).strip().encode("ascii", "ignore") 289 return self.Git("rev-list -1 " + tag_name).strip().encode("ascii", "ignore")
OLDNEW
« no previous file with comments | « no previous file | tools/release/merge_to_branch.py » ('j') | tools/release/merge_to_branch.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698