Rename ClRefMap to CLRefMap for consistency with other names
Change-Id: I04a0986931ed6d4840ae046ba36654b8fdde5fcb
diff --git a/gerrit/.api b/gerrit/.api
index e73949a..3f298c1 100644
--- a/gerrit/.api
+++ b/gerrit/.api
@@ -7,11 +7,11 @@
pkg gerrit, func New(runutil.Sequence, *url.URL) *Gerrit
pkg gerrit, func NewChangeError(Change, error) *ChangeError
pkg gerrit, func NewMultiPartCLSet() *MultiPartCLSet
-pkg gerrit, func NewOpenCLs(ClRefMap, CLList) ([]CLList, []error)
+pkg gerrit, func NewOpenCLs(CLRefMap, CLList) ([]CLList, []error)
pkg gerrit, func ParseRefString(string) (int, int, error)
pkg gerrit, func PresubmitTestTypes() []string
pkg gerrit, func Push(runutil.Sequence, CLOpts) error
-pkg gerrit, func ReadLog(string) (ClRefMap, error)
+pkg gerrit, func ReadLog(string) (CLRefMap, error)
pkg gerrit, func Reference(CLOpts) string
pkg gerrit, func WriteLog(string, CLList) error
pkg gerrit, method (*ChangeError) Error() string
@@ -38,6 +38,7 @@
pkg gerrit, type CLOpts struct, Reviewers []string
pkg gerrit, type CLOpts struct, Topic string
pkg gerrit, type CLOpts struct, Verify bool
+pkg gerrit, type CLRefMap map[string]Change
pkg gerrit, type Change struct
pkg gerrit, type Change struct, AutoSubmit bool
pkg gerrit, type Change struct, Change_id string
@@ -52,7 +53,6 @@
pkg gerrit, type ChangeError struct
pkg gerrit, type ChangeError struct, CL Change
pkg gerrit, type ChangeError struct, Err error
-pkg gerrit, type ClRefMap map[string]Change
pkg gerrit, type Comment struct
pkg gerrit, type Comment struct, Line int
pkg gerrit, type Comment struct, Message string
diff --git a/gerrit/gerrit.go b/gerrit/gerrit.go
index e22b48b..40eb37d 100644
--- a/gerrit/gerrit.go
+++ b/gerrit/gerrit.go
@@ -177,7 +177,7 @@
// The following types reflect the schema Gerrit uses to represent
// CLs.
type CLList []Change
-type ClRefMap map[string]Change
+type CLRefMap map[string]Change
type Change struct {
// CL data.
Change_id string
diff --git a/gerrit/multipart_test.go b/gerrit/multipart_test.go
index f75173b..3461a58 100644
--- a/gerrit/multipart_test.go
+++ b/gerrit/multipart_test.go
@@ -118,7 +118,7 @@
}
type testCase struct {
- prevCLsMap ClRefMap
+ prevCLsMap CLRefMap
curCLs CLList
expected []CLList
}
@@ -128,25 +128,25 @@
// Both prevCLsMap and curCLs are empty.
testCase{
- prevCLsMap: ClRefMap{},
+ prevCLsMap: CLRefMap{},
curCLs: CLList{},
expected: []CLList{},
},
// prevCLsMap is empty, curCLs is not.
testCase{
- prevCLsMap: ClRefMap{},
+ prevCLsMap: CLRefMap{},
curCLs: CLList{nonMultiPartCLs[0], nonMultiPartCLs[1]},
expected: []CLList{CLList{nonMultiPartCLs[0]}, CLList{nonMultiPartCLs[1]}},
},
// prevCLsMap is not empty, curCLs is.
testCase{
- prevCLsMap: ClRefMap{nonMultiPartCLs[0].Reference(): nonMultiPartCLs[0]},
+ prevCLsMap: CLRefMap{nonMultiPartCLs[0].Reference(): nonMultiPartCLs[0]},
curCLs: CLList{},
expected: []CLList{},
},
// prevCLsMap and curCLs are not empty, and they have overlapping refs.
testCase{
- prevCLsMap: ClRefMap{
+ prevCLsMap: CLRefMap{
nonMultiPartCLs[0].Reference(): nonMultiPartCLs[0],
nonMultiPartCLs[1].Reference(): nonMultiPartCLs[1],
},
@@ -155,7 +155,7 @@
},
// prevCLsMap and curCLs are not empty, and they have NO overlapping refs.
testCase{
- prevCLsMap: ClRefMap{nonMultiPartCLs[0].Reference(): nonMultiPartCLs[0]},
+ prevCLsMap: CLRefMap{nonMultiPartCLs[0].Reference(): nonMultiPartCLs[0]},
curCLs: CLList{nonMultiPartCLs[1]},
expected: []CLList{CLList{nonMultiPartCLs[1]}},
},
@@ -166,21 +166,21 @@
// len(curCLs) > len(prevCLsMap).
// And the CLs in curCLs have different topics.
testCase{
- prevCLsMap: ClRefMap{multiPartCLs[0].Reference(): multiPartCLs[0]},
+ prevCLsMap: CLRefMap{multiPartCLs[0].Reference(): multiPartCLs[0]},
curCLs: CLList{multiPartCLs[0], multiPartCLs[2]},
expected: []CLList{},
},
// len(curCLs) > len(prevCLsMap).
// And the CLs in curCLs form a complete multi part cls set.
testCase{
- prevCLsMap: ClRefMap{multiPartCLs[0].Reference(): multiPartCLs[0]},
+ prevCLsMap: CLRefMap{multiPartCLs[0].Reference(): multiPartCLs[0]},
curCLs: CLList{multiPartCLs[0], multiPartCLs[1]},
expected: []CLList{CLList{multiPartCLs[0], multiPartCLs[1]}},
},
// len(curCLs) == len(prevCLsMap).
// And cl[6] has a larger patchset than multiPartCLs[4] with identical cl number.
testCase{
- prevCLsMap: ClRefMap{
+ prevCLsMap: CLRefMap{
multiPartCLs[0].Reference(): multiPartCLs[0],
multiPartCLs[1].Reference(): multiPartCLs[1],
},
@@ -191,7 +191,7 @@
////////////////////////////////
// Tests for mixed.
testCase{
- prevCLsMap: ClRefMap{
+ prevCLsMap: CLRefMap{
multiPartCLs[0].Reference(): multiPartCLs[0],
multiPartCLs[1].Reference(): multiPartCLs[1],
},
diff --git a/gerrit/presubmit.go b/gerrit/presubmit.go
index e14c9d6..a40a1a8 100644
--- a/gerrit/presubmit.go
+++ b/gerrit/presubmit.go
@@ -17,8 +17,8 @@
// system that queries Gerrit for new changes and does <something> with them.
// ReadLog returns a map of CLs indexed by their refs, read from the given log file.
-func ReadLog(logFilePath string) (ClRefMap, error) {
- results := ClRefMap{}
+func ReadLog(logFilePath string) (CLRefMap, error) {
+ results := CLRefMap{}
bytes, err := ioutil.ReadFile(logFilePath)
if err != nil {
// File not existing is OK: just return an empty map of CLs.
@@ -38,7 +38,7 @@
// map of ref strings => CLs.
func WriteLog(logFilePath string, cls CLList) (e error) {
// Index CLs with their refs.
- results := ClRefMap{}
+ results := CLRefMap{}
for _, cl := range cls {
results[cl.Reference()] = cl
}
@@ -80,7 +80,7 @@
// a CLList [3001/1 3002/1] will be returned. Then suppose in the next query,
// we got cl 3002/2 which is newer then 3002/1. In this case, a CLList
// [3001/1 3002/2] will be returned.
-func NewOpenCLs(prevCLsMap ClRefMap, curCLs CLList) ([]CLList, []error) {
+func NewOpenCLs(prevCLsMap CLRefMap, curCLs CLList) ([]CLList, []error) {
retNewCLs := []CLList{}
topicsInNewCLs := map[string]bool{}
multiPartCLs := CLList{}
