mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-21 22:24:32 +00:00
00c10cf539
## Why this should be merged Closes #25 ## How this works See https://github.com/ava-labs/libevm/discussions/126. The code is in a new module to (a) avoid polluting the root `go.mod` file and (b) because `go-git` requires a newer version of Go. Unfortunately `go-git` doesn't support cherry-picking yet so a Bash script had to be used for that bit `#!/sad`. ## How this was tested Inspection of output when running `cherrypick.sh` (with `set -x` added) from the current branch. ``` ... ... + CHERRY_PICKS='2bd6bd01d2e8561dd7fc21b631f4a34ac16627a199bbbc02771e9bf2a09e69f815f6f5e4b8058d5a34b46a2f75159fb1a1dbda71839a270a353bac92e3108e4b74fb0eefec29' ... Skipping2bd6bd01d2already in history ... Cherry-picking99bbbc0277... Cherry-picking1e9bf2a09e... Cherry-picking69f815f6f5... Cherry-pickinge4b8058d5a... Cherry-picking34b46a2f75... Cherry-picking159fb1a1db... Cherry-pickingda71839a27... + git cherry-pick99bbbc02771e9bf2a09e69f815f6f5e4b8058d5a34b46a2f75159fb1a1dbda71839a27```
113 lines
3 KiB
Go
113 lines
3 KiB
Go
// Copyright 2025 the libevm authors.
|
|
//
|
|
// The libevm additions to go-ethereum are free software: you can redistribute
|
|
// them and/or modify them under the terms of the GNU Lesser General Public License
|
|
// as published by the Free Software Foundation, either version 3 of the License,
|
|
// or (at your option) any later version.
|
|
//
|
|
// The libevm additions are distributed in the hope that they will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
|
|
// General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public License
|
|
// along with the go-ethereum library. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
package release
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"sort"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/go-git/go-git/v5"
|
|
"github.com/go-git/go-git/v5/plumbing"
|
|
"github.com/go-git/go-git/v5/plumbing/object"
|
|
"github.com/google/go-cmp/cmp"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
_ "embed"
|
|
)
|
|
|
|
var (
|
|
//go:embed cherrypicks
|
|
cherryPicks string
|
|
lineFormatRE = regexp.MustCompile(`^([a-fA-F0-9]{40}) # (.*)$`)
|
|
)
|
|
|
|
func TestCherryPicksFormat(t *testing.T) {
|
|
type parsedLine struct {
|
|
hash, commitMsg string
|
|
}
|
|
var (
|
|
rawLines []string
|
|
lines []parsedLine
|
|
)
|
|
|
|
for i, line := range strings.Split(cherryPicks, "\n") {
|
|
if line == "" || strings.HasPrefix(line, "#") {
|
|
continue
|
|
}
|
|
|
|
switch matches := lineFormatRE.FindStringSubmatch(line); len(matches) {
|
|
case 3:
|
|
rawLines = append(rawLines, line)
|
|
lines = append(lines, parsedLine{
|
|
hash: matches[1],
|
|
commitMsg: matches[2],
|
|
})
|
|
|
|
default:
|
|
t.Errorf("Line %d is improperly formatted: %s", i, line)
|
|
}
|
|
}
|
|
if t.Failed() {
|
|
t.Fatalf("Required line regexp: %s", lineFormatRE.String())
|
|
}
|
|
|
|
opts := &git.PlainOpenOptions{DetectDotGit: true}
|
|
repo, err := git.PlainOpenWithOptions("./", opts)
|
|
require.NoErrorf(t, err, "git.PlainOpenWithOptions(./, %+v", opts)
|
|
|
|
fetch := &git.FetchOptions{
|
|
RemoteURL: "https://github.com/ethereum/go-ethereum.git",
|
|
}
|
|
err = repo.Fetch(fetch)
|
|
if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
|
|
t.Fatalf("%T.Fetch(%+v) error %v", repo, fetch, err)
|
|
}
|
|
|
|
commits := make([]struct {
|
|
obj *object.Commit
|
|
line parsedLine
|
|
}, len(lines))
|
|
|
|
for i, line := range lines {
|
|
obj, err := repo.CommitObject(plumbing.NewHash(line.hash))
|
|
require.NoErrorf(t, err, "%T.CommitObject(%q)", repo, line.hash)
|
|
|
|
commits[i].obj = obj
|
|
commits[i].line = line
|
|
}
|
|
sort.Slice(commits, func(i, j int) bool {
|
|
ci, cj := commits[i].obj, commits[j].obj
|
|
return ci.Committer.When.Before(cj.Committer.When)
|
|
})
|
|
|
|
var want []string
|
|
for _, c := range commits {
|
|
msg := strings.Split(c.obj.Message, "\n")[0]
|
|
want = append(
|
|
want,
|
|
fmt.Sprintf("%s # %s", c.line.hash, msg),
|
|
)
|
|
}
|
|
if diff := cmp.Diff(want, rawLines); diff != "" {
|
|
t.Errorf("Commits in `cherrypicks` file out of order or have incorrect commit message(s);\n(-want +got):\n%s", diff)
|
|
t.Logf("To fix, copy:\n%s", strings.Join(want, "\n"))
|
|
}
|
|
}
|