Tools/Scripts/webkitpy/tool/steps/confirmdiff.py - Issue 544593003: Require diff comfirmation only when there is someting to confirm.

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/steps/confirmdiff.py

Issue 544593003: Require diff comfirmation only when there is someting to confirm. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

Index: Tools/Scripts/webkitpy/tool/steps/confirmdiff.py

diff --git a/Tools/Scripts/webkitpy/tool/steps/confirmdiff.py b/Tools/Scripts/webkitpy/tool/steps/confirmdiff.py

index 6cab6107dba1979fb217185e119df809959fb298..8472da6cc1a501997092c6218aec27605511b130 100644

--- a/Tools/Scripts/webkitpy/tool/steps/confirmdiff.py

+++ b/Tools/Scripts/webkitpy/tool/steps/confirmdiff.py

@@ -71,8 +71,8 @@ class ConfirmDiff(AbstractStep):

if not self._options.confirm:

return

pretty_diff_file = self._show_pretty_diff()

- diff_correct = self._tool.user.confirm("Was that diff correct?")

if pretty_diff_file:

+ diff_correct = self._tool.user.confirm("Was that diff correct?")

pretty_diff_file.close()

- if not diff_correct:

- self._exit(1)

+ if not diff_correct:

+ self._exit(1)

« no previous file with comments | « no previous file | no next file » | no next file with comments »