Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

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

Created:
4 years ago by qyearsley
Modified:
3 years, 11 months ago
Reviewers:
wkorman
CC:
blink-reviews, chromium-reviews, Dirk Pranke, jeffcarp, mlamouri+watch-blink_chromium.org, mvanouwerkerk+watch_chromium.org, Xianzhu
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Only add unstaged baseline changes to the git index when rebaselining. Reason: Currently rebaseline-cl will add all files in LayoutTests/ to the index even if they are files unrelated to rebaseline-cl. In this CL: - In git.py, add a method unstaged_changes() which just lists currently unstaged changes. There were already methods for listing files that are different from HEAD; that includes staged changes, but I believe we don't want to abort if there are already staged changes to baselines, right? If that's not the case, then this CL could potentially be made simpler. - In rebaseline.py, add a method unstaged_baselines(), which just lists unstaged changes to baselines. Additionally, when adding files after rebaselining, only add staged baselines to the git index, not other files. - In rebaseline_cl.py, add a check for unstaged baselines at the start and abort with an error message if there are any. BUG=662584 Committed: https://crrev.com/99b0e4f3108df37cae3ed6664ca6f14b8a1fd056 Cr-Commit-Position: refs/heads/master@{#440830}

Patch Set 1 #

Patch Set 2 : rebaseline-cl: Abort if there are unstaged baseline changes. #

Messages

Total messages: 16 (11 generated)
qyearsley
4 years ago (2016-12-21 00:07:45 UTC) #4
wkorman
lgtm
3 years, 12 months ago (2016-12-28 01:45:07 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2590693002/20001
3 years, 12 months ago (2016-12-28 02:48:55 UTC) #11
commit-bot: I haz the power
Committed patchset #2 (id:20001)
3 years, 12 months ago (2016-12-28 03:48:52 UTC) #14
commit-bot: I haz the power
3 years, 11 months ago (2017-01-02 15:48:32 UTC) #16
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/99b0e4f3108df37cae3ed6664ca6f14b8a1fd056
Cr-Commit-Position: refs/heads/master@{#440830}

Powered by Google App Engine
This is Rietveld 408576698