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

Unified Diff: tools/push-to-trunk/git_recipes.py

Issue 181603002: Fix patch creation in merge-to-branch script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/push-to-trunk/merge_to_branch.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/push-to-trunk/git_recipes.py
diff --git a/tools/push-to-trunk/git_recipes.py b/tools/push-to-trunk/git_recipes.py
index f5a231599e255d00675e7b926a45ec33a9ed1053..088ba53bd806bdbae83e52590b44962493854b4c 100644
--- a/tools/push-to-trunk/git_recipes.py
+++ b/tools/push-to-trunk/git_recipes.py
@@ -72,7 +72,7 @@ class GitRecipesMixin(object):
@Strip
def GitLog(self, n=0, format="", grep="", git_hash="", parent_hash="",
- branch="", reverse=False, patch=False):
+ branch="", reverse=False):
assert not (git_hash and parent_hash)
args = ["log"]
if n > 0:
@@ -83,8 +83,6 @@ class GitRecipesMixin(object):
args.append("--grep=\"%s\"" % grep)
if reverse:
args.append("--reverse")
- if patch:
- args.append("-p")
if git_hash:
args.append(git_hash)
if parent_hash:
@@ -92,6 +90,10 @@ class GitRecipesMixin(object):
args.append(branch)
return self.Git(MakeArgs(args))
+ def GitGetPatch(self, git_hash):
+ assert git_hash
+ return self.Git(MakeArgs(["log", "-1", "-p", git_hash]))
+
def GitAdd(self, name):
assert name
self.Git(MakeArgs(["add", Quoted(name)]))
« no previous file with comments | « no previous file | tools/push-to-trunk/merge_to_branch.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698