third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py - Issue 2590693002: Only add unstaged baseline changes to the git index when rebaselining.

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: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py

Issue 2590693002: Only add unstaged baseline changes to the git index when rebaselining. (Closed)

Patch Set: rebaseline-cl: Abort if there are unstaged baseline changes. Created 4 years 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

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py

index 601aa1aedc94faf3325ab9da8338e5a188e1f6eb..e4da1f028c7853af9f0764d9a3b06ae33e3c23fa 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_cl.py

@@ -52,10 +52,20 @@ class RebaselineCL(AbstractParallelRebaselineCommand):

def execute(self, options, args, tool):

self._tool = tool

+ unstaged_baselines = self.unstaged_baselines()

+ if unstaged_baselines:

+ _log.error('Aborting: there are unstaged baselines:')

+ for path in unstaged_baselines:

+ _log.error(' %s', path)

+ return

issue_number = self._get_issue_number(options)

if not issue_number:

return

+ # TODO(qyearsley): Replace this with git cl try-results to remove

+ # dependency on Rietveld. See crbug.com/671684.

builds = self.rietveld.latest_try_jobs(issue_number, self._try_bots())

if options.trigger_jobs: