Tools/Scripts/webkitpy/tool/commands/rebaseline.py - Issue 417123006: Make webkit-patch auto-rebaseline a bit more robust to errors.

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/Scripts/webkitpy/tool/commands/rebaseline.py

Issue 417123006: Make webkit-patch auto-rebaseline a bit more robust to errors. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: update test result Created 6 years, 4 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/Scripts/webkitpy/tool/commands/rebaseline.py

diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

index c25c8ede184e2af8a73c77527a66c8cb07029ccd..b7cd0c9aa4da352d0ce6bf7846399969da7a3a9d 100644

--- a/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

+++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

@@ -825,6 +825,7 @@ class AutoRebaseline(AbstractParallelRebaselineCommand):

test_prefix_list, lines_to_remove = self.get_test_prefix_list(tests)

+ did_finish = False

try:

old_branch_name = tool.scm().current_branch()

tool.scm().delete_branch(self.AUTO_REBASELINE_BRANCH_NAME)

@@ -850,8 +851,11 @@ class AutoRebaseline(AbstractParallelRebaselineCommand):

tool.executive.run_command(['git', 'pull'])

self._run_git_cl_command(options, ['dcommit', '-f'])

+ except Exception as e:

+ _log.error(e)

finally:

- self._run_git_cl_command(options, ['set_close'])

+ if did_finish:

+ self._run_git_cl_command(options, ['set_close'])

tool.scm().ensure_cleanly_tracking_remote_master()

tool.scm().checkout_branch(old_branch_name)

tool.scm().delete_branch(self.AUTO_REBASELINE_BRANCH_NAME)

« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py » ('j') | no next file with comments »