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

Issue 1376583003: Fix a bug in the GN roll script. (Closed)

Created:
5 years, 2 months ago by Dirk Pranke
Modified:
5 years, 2 months ago
Reviewers:
brettw
CC:
chromium-reviews, tfarina
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Fix a bug in the GN roll script. When complete, the script attempts to switch from the branches it creates to build and roll things back to the branch you were on before. The way it determines what branch you were on before is by looking at git's reflog. However, the way I was looking at the reflog was wrong; first, it was doing an re.match() instead of an re.search(), and so it was looking for a match at the beginning of the output (which would never be true). Second, we were looking at only the most recent entry, and when the roll script actually executed, the most recent entry would always be a commit, not a checkout, and so we wouldn't see what the previous branch was. R=brettw@chromium.org BUG=

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+5 lines, -2 lines) Patch
M tools/gn/bin/roll_gn.py View 1 chunk +5 lines, -2 lines 0 comments Download

Dependent Patchsets:

Messages

Total messages: 4 (0 generated)
Dirk Pranke
5 years, 2 months ago (2015-09-30 00:27:53 UTC) #1
Dirk Pranke
5 years, 2 months ago (2015-09-30 00:28:25 UTC) #2
brettw
lgtm
5 years, 2 months ago (2015-09-30 00:33:31 UTC) #3
Bons
5 years, 2 months ago (2015-09-30 18:27:26 UTC) #4
On 2015/09/30 00:33:31, brettw wrote:
> lgtm

Closing out in favor of https://codereview.chromium.org/1381753003/ which
includes this.

Powered by Google App Engine
This is Rietveld 408576698