tools/push-to-trunk/merge_to_branch.py - Issue 607893004: Add tag write access to merge script.

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/merge_to_branch.py

Issue 607893004: Add tag write access to merge script. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Review. Created 6 years, 2 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/merge_to_branch.py

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

index 9a9e65cd0a8b9d2f7774408405f7b476893c630c..927e504f7af7715a421960be8de8a87e8be86824 100755

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

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

@@ -198,6 +198,7 @@ class CommitLocal(Step):

else:

title = ("Version %s (merged %s)"

% (self["version"], self["revision_list"]))

+ self["commit_title"] = title

self["new_commit_msg"] = "%s\n\n%s" % (title, self["new_commit_msg"])

TextToFile(self["new_commit_msg"], self.Config("COMMITMSG_FILE"))

self.GitCommit(file_name=self.Config("COMMITMSG_FILE"))

@@ -219,8 +220,10 @@ class TagRevision(Step):

def RunStep(self):

if self._options.revert_bleeding_edge:

return

- print "Creating tag svn/tags/%s" % self["version"]

- self.vc.Tag(self["version"], self.vc.RemoteBranch(self["merge_to_branch"]))

+ print "Creating tag %s" % self["version"]

+ self.vc.Tag(self["version"],

+ self.vc.RemoteBranch(self["merge_to_branch"]),

+ self["commit_title"])

class CleanUp(Step):

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