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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side 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 unified diff | Download patch

OLD	NEW
1 # Copyright (C) 2010 Google Inc. All rights reserved.	1 # Copyright (C) 2010 Google Inc. All rights reserved.

2 #	2 #

3 # Redistribution and use in source and binary forms, with or without	3 # Redistribution and use in source and binary forms, with or without

4 # modification, are permitted provided that the following conditions are	4 # modification, are permitted provided that the following conditions are

5 # met:	5 # met:

6 #	6 #

7 # * Redistributions of source code must retain the above copyright	7 # * Redistributions of source code must retain the above copyright

8 # notice, this list of conditions and the following disclaimer.	8 # notice, this list of conditions and the following disclaimer.

9 # * Redistributions in binary form must reproduce the above	9 # * Redistributions in binary form must reproduce the above

10 # copyright notice, this list of conditions and the following disclaimer	10 # copyright notice, this list of conditions and the following disclaimer

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64	64

65 def diff(self):	65 def diff(self):

66 changed_files = self._tool.scm().changed_files(self._options.git_commit)	66 changed_files = self._tool.scm().changed_files(self._options.git_commit)

67 return self._tool.scm().create_patch(self._options.git_commit,	67 return self._tool.scm().create_patch(self._options.git_commit,

68 changed_files=changed_files)	68 changed_files=changed_files)

69	69

70 def run(self, state):	70 def run(self, state):

71 if not self._options.confirm:	71 if not self._options.confirm:

72 return	72 return

73 pretty_diff_file = self._show_pretty_diff()	73 pretty_diff_file = self._show_pretty_diff()

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

75 if pretty_diff_file:	74 if pretty_diff_file:

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

76 pretty_diff_file.close()	76 pretty_diff_file.close()

77 if not diff_correct:	77 if not diff_correct:

78 self._exit(1)	78 self._exit(1)

OLD	NEW

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