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

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

Issue 197313005: Revert "Maintain change log file directly on trunk branch in push-to-trunk." and related changes. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 9 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 | « src/version.cc ('k') | tools/push-to-trunk/push_to_trunk.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 e8e81fc98cbf1732a97c468734a5c60b74e3d94b..fb7424f709478885ed5142d2dbb4c467f92b8222 100644
--- a/tools/push-to-trunk/git_recipes.py
+++ b/tools/push-to-trunk/git_recipes.py
@@ -133,11 +133,8 @@ class GitRecipesMixin(object):
def GitDCommit(self):
self.Git("cl dcommit -f --bypass-hooks", retry_on=lambda x: x is None)
- def GitDiff(self, loc1, loc2, exclude=None):
- exclude = exclude or []
- files = self.Git(MakeArgs(["diff", "--name-only", loc1, loc2]))
- files = filter(lambda f: f not in exclude, files.strip().splitlines())
- return self.Git(MakeArgs(["diff", loc1, loc2] + files))
+ def GitDiff(self, loc1, loc2):
+ return self.Git(MakeArgs(["diff", loc1, loc2]))
def GitPull(self):
self.Git("pull")
« no previous file with comments | « src/version.cc ('k') | tools/push-to-trunk/push_to_trunk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698