[autoroll] Fix Google3 LastRollRev.
Change-Id: I90fd9c2513292061217ed699ce52f0f5e853569a
Reviewed-on: https://skia-review.googlesource.com/49745
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
diff --git a/autoroll/go/google3/google3.go b/autoroll/go/google3/google3.go
index 36a6fa2..9b6453d 100644
--- a/autoroll/go/google3/google3.go
+++ b/autoroll/go/google3/google3.go
@@ -125,12 +125,6 @@
}
}
- lastRoll := a.recent.LastRoll()
- lastRollRev := ""
- if lastRoll != nil {
- lastRollRev = lastRoll.RollingTo
- }
-
commitsNotRolled := 0
if lastSuccessRev != "" {
headRev, err := a.childRepo.RevParse(a.childBranch)
@@ -144,6 +138,8 @@
commitsNotRolled = len(revs)
}
+ lastRoll := a.recent.LastRoll()
+
if preserveLastError {
errorMsg = a.status.Get(true, nil).Error
} else if errorMsg != "" {
@@ -165,7 +161,7 @@
FullHistoryUrl: "https://goto.google.com/skia-autoroll-history",
IssueUrlBase: "https://goto.google.com/skia-autoroll-cl/",
LastRoll: lastRoll,
- LastRollRev: lastRollRev,
+ LastRollRev: lastSuccessRev,
Mode: &modes.ModeChange{
Message: "https://sites.google.com/a/google.com/skia-infrastructure/docs/google3-autoroller",
Mode: modes.MODE_RUNNING,
diff --git a/autoroll/go/google3/google3_test.go b/autoroll/go/google3/google3_test.go
index 3a7a066..b54029f 100644
--- a/autoroll/go/google3/google3_test.go
+++ b/autoroll/go/google3/google3_test.go
@@ -83,6 +83,7 @@
status := a.GetStatus(true)
assert.Equal(t, 0, status.NumFailedRolls)
assert.Equal(t, 2, status.NumNotRolledCommits)
+ assert.Equal(t, issue1.RollingTo, status.LastRollRev)
assert.Nil(t, status.CurrentRoll)
testutils.AssertDeepEqual(t, issue1, status.LastRoll)
testutils.AssertDeepEqual(t, []*autoroll.AutoRollIssue{issue1}, status.Recent)
@@ -105,6 +106,7 @@
status = a.GetStatus(true)
assert.Equal(t, 2, status.NumFailedRolls)
assert.Equal(t, 2, status.NumNotRolledCommits)
+ assert.Equal(t, issue1.RollingTo, status.LastRollRev)
assert.Equal(t, "error message", status.Error)
testutils.AssertDeepEqual(t, issue4, status.CurrentRoll)
testutils.AssertDeepEqual(t, issue3, status.LastRoll)
@@ -124,6 +126,7 @@
status = a.GetStatus(false)
assert.Equal(t, 2, status.NumFailedRolls)
assert.Equal(t, 2, status.NumNotRolledCommits)
+ assert.Equal(t, issue1.RollingTo, status.LastRollRev)
assert.Equal(t, "", status.Error)
testutils.AssertDeepEqual(t, issue4, status.CurrentRoll)
testutils.AssertDeepEqual(t, issue3, status.LastRoll)
