tools/push-to-trunk/common_includes.py - Issue 223863003: Make auto-roll script also roll patched trunk revisions.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 223863003: Make auto-roll script also roll patched trunk revisions. (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:

Index: tools/push-to-trunk/common_includes.py

diff --git a/tools/push-to-trunk/common_includes.py b/tools/push-to-trunk/common_includes.py

index 6368a279f2309dc5ee2409cf0764fe3c5c6de8df..efea54a0998a71986a1be5c334fbcafde20820e8 100644

--- a/tools/push-to-trunk/common_includes.py

+++ b/tools/push-to-trunk/common_includes.py

@@ -442,8 +442,12 @@ class Step(GitRecipesMixin):

except GitFailedException:

self.WaitForResolvingConflicts(patch_file)

- def FindLastTrunkPush(self, parent_hash=""):

- push_pattern = "^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based"

+ def FindLastTrunkPush(self, parent_hash="", include_patches=False):

+ push_pattern = "^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*"

+ if not include_patches:

+ # Non-patched versions only have three numbers followed by the "(based

+ # on...) comment."

+ push_pattern += " (based"

branch = "" if parent_hash else "svn/trunk"

return self.GitLog(n=1, format="%H", grep=push_pattern,

parent_hash=parent_hash, branch=branch)

« no previous file with comments | « tools/push-to-trunk/chromium_roll.py ('k') | tools/push-to-trunk/test_scripts.py » ('j') | no next file with comments »