tools/push-to-trunk/merge_to_branch.py - Issue 585893002: Refactoring: Use fake cwd in release script tests.

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 585893002: Refactoring: Use fake cwd in release script tests. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Remove git location legacy. Created 6 years, 3 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 f6e0bb0350d83e50e04287f02e75cdf131863e3b..ec06f9c30362094a4c53246722e2644c3ef385a5 100755

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

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

@@ -41,7 +41,6 @@ CONFIG = {

PERSISTFILE_BASENAME: "/tmp/v8-merge-to-branch-tempfile",

ALREADY_MERGING_SENTINEL_FILE:

"/tmp/v8-merge-to-branch-tempfile-already-merging",

- DOT_GIT_LOCATION: ".git",

VERSION_FILE: "src/version.cc",

TEMPORARY_PATCH_FILE: "/tmp/v8-prepare-merge-tempfile-temporary-patch",

COMMITMSG_FILE: "/tmp/v8-prepare-merge-tempfile-commitmsg",

@@ -60,7 +59,7 @@ class Preparation(Step):

self.Die("A merge is already in progress")

open(self.Config(ALREADY_MERGING_SENTINEL_FILE), "a").close()

- self.InitialEnvironmentChecks()

+ self.InitialEnvironmentChecks(self.default_cwd)

if self._options.revert_bleeding_edge:

self["merge_to_branch"] = "bleeding_edge"

elif self._options.branch:

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