From 8493f3939c48c001ece2bff94d343ceb2ac405a7 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Wed, 10 Jun 2020 17:07:43 +0100
Subject: [PATCH] bin: not-in-stable.go - script to help with merging fixes to
the stable branch
---
bin/not-in-stable.go | 73 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 73 insertions(+)
create mode 100755 bin/not-in-stable.go
diff --git a/bin/not-in-stable.go b/bin/not-in-stable.go
new file mode 100755
index 000000000..46380a2ae
--- /dev/null
+++ b/bin/not-in-stable.go
@@ -0,0 +1,73 @@
+// This shows the commits not yet in the stable branch
+package main
+
+import (
+ "bytes"
+ "flag"
+ "fmt"
+ "io/ioutil"
+ "log"
+ "os"
+ "os/exec"
+ "regexp"
+)
+
+// version=$(sed <VERSION -e 's/\.[0-9]+*$//g')
+// echo "Checking version ${version}"
+// echo
+//
+// git log --oneline ${version}.0..${version}-stable | cut -c11- | sort > /tmp/in-stable
+// git log --oneline ${version}.0..master | cut -c11- | sort > /tmp/in-master
+//
+// comm -23 /tmp/in-master /tmp/in-stable
+
+var logRe = regexp.MustCompile(`^([0-9a-f]{4,}) (.*)$`)
+
+// run the test passed in with the -run passed in
+func readCommits(from, to string) (logMap map[string]string, logs []string) {
+ cmd := exec.Command("git", "log", "--oneline", from+".."+to)
+ out, err := cmd.Output()
+ if err != nil {
+ log.Fatalf("failed to run git log: %v", err)
+ }
+ logMap = map[string]string{}
+ logs = []string{}
+ for _, line := range bytes.Split(out, []byte{'\n'}) {
+ if len(line) == 0 {
+ continue
+ }
+ match := logRe.FindSubmatch(line)
+ if match == nil {
+ log.Fatalf("failed to parse line: %q", line)
+ }
+ var hash, logMessage = string(match[1]), string(match[2])
+ logMap[logMessage] = hash
+ logs = append(logs, logMessage)
+ }
+ return logMap, logs
+}
+
+func main() {
+ flag.Parse()
+ args := flag.Args()
+ if len(args) != 0 {
+ log.Fatalf("Syntax: %s", os.Args[0])
+ }
+ versionBytes, err := ioutil.ReadFile("VERSION")
+ if err != nil {
+ log.Fatalf("Failed to read version: %v", err)
+ }
+ i := bytes.LastIndexByte(versionBytes, '.')
+ version := string(versionBytes[:i])
+ log.Printf("Finding commits not in stable %s", version)
+ masterMap, masterLogs := readCommits(version+".0", "master")
+ stableMap, _ := readCommits(version+".0", version+"-stable")
+ for _, logMessage := range masterLogs {
+ // Commit found in stable already
+ if _, found := stableMap[logMessage]; found {
+ continue
+ }
+ hash := masterMap[logMessage]
+ fmt.Printf("%s %s\n", hash, logMessage)
+ }
+}