若原有项目的commit已够用(70以上)就直接修改时间&一次性push

Author: wangle201210

README.md

@@ -1,5 +1,16 @@
 # autoAddCommit
 自动添加git提交记录
+
 # 运行方式
-1. 直接运行 `./make.sh` 后输入文件路径
-2. 运行`go install` 后，到自己对应目录运行 `autoAddCommit` 再输入文件路径
+### 有golang环境的情况下   
+1. 修改 cd 后面的路径后 直接运行 `./make.sh` 后输入文件路径   
+2. 运行`go install` 后，到自己对应目录运行 `autoAddCommit` 再输入文件路径   
+### 没golang环境的 就直接下载二进制文件使用
+
+# 常见问题
+1. 项目最后没成功push  
+ 在根目录手动运行 `git push -f`
+2. 再输入文件路径 确保只是含有 100 个文件 不然会重复使用
+
+# 声明
+本项目仅供学习交流严禁使用于任何商业用途!

commit.log

@@ -25,7 +25,6 @@ func CopyFile(to, from string) (err error) {
 	if _, err := os.Stat(p); os.IsNotExist(err) {
 		os.MkdirAll(p, 0777) //0777也可以os.ModePerm
 		os.Chmod(p, 0777)
-
 	}
 	fdest, err := os.Create(to)
 	if err != nil {
@@ -42,7 +41,7 @@ func CopyFile(to, from string) (err error) {
 
 // files all files with suffix
 func GetFiles(dir string) (result []File) {
-	s, err := getCurrentPath()
+	s, err := GetCurrentPath()
 	if err != nil {
 		util.Errorf("getCurrentPath err (%+v)", err)
 		panic("getCurrentPath")
@@ -65,11 +64,25 @@ func GetFiles(dir string) (result []File) {
 	return
 }
 
-func getCurrentPath() (string, error) {
+func GetCurrentPath() (string, error) {
 	getwd, err := os.Getwd()
 	if err != nil {
 		util.Errorf("Getwd err (%+v)", err)
 		return "", err
 	}
 	return getwd, nil
 }
+
+func CreateFile(to string) {
+	p := path.Dir(to)
+	if _, err := os.Stat(p); os.IsNotExist(err) {
+		os.MkdirAll(p, 0777) //0777也可以os.ModePerm
+		os.Chmod(p, 0777)
+	}
+	fdest, err := os.Create(to)
+	if err != nil {
+		util.Errorf("Create file err (%+v)", err)
+		return
+	}
+	defer fdest.Close()
+}

file/file.go

@@ -1,16 +1,14 @@
 package git
 
 import (
-	"bufio"
 	"context"
 	"encoding/json"
 	"fmt"
 	"git.medlinker.com/wanghouwei/autoAddCommit/file"
 	"git.medlinker.com/wanghouwei/autoAddCommit/util"
-	"io"
 	"math/rand"
-	"os"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -20,20 +18,27 @@ var (
 	startTime time.Time
 	maxTimes  = 100
 	baseDir   = ""
-	commitTimes = 50
+	// commit 的数量
+	commitTimes = 70
+	// 前面100 天 去分 commit
+	seconds = 100 * 24 * 60 * 60
 )
 
 type commit struct {
 	Date string `json:"date"`
 	Hash string `json:"hash"`
-	Msg string `json:"msg"`
+	Msg  string `json:"msg"`
 }
 
-func changeDate() {
-	id, _ := getCommitID()
+func changeDate(hash, t string) {
+	if hash == "" {
+		hash, _ = getCommitID()
+	}
+	if t == "" {
+		t = startTime.Format("2006-01-02 15:04:05")
+	}
 	cmd := `if [ $GIT_COMMIT = %s ]; then export GIT_AUTHOR_DATE="%s" export GIT_COMMITTER_DATE="%s"; fi`
-	t := startTime.Format("2006-01-02 15:04:05")
-	cmdString := fmt.Sprintf(cmd, id, t, t)
+	cmdString := fmt.Sprintf(cmd, hash, t, t)
 	ret, err := util.RunCmdRet("git", "filter-branch", "-f", "--env-filter", cmdString)
 	if err != nil {
 		util.Errorf("filter-branch err (%+v)", err)
@@ -45,17 +50,21 @@ func changeDate() {
 func Run(dir string) {
 	now := time.Now()
 	// 前推4个月
-	startTime = now.Add(time.Second * -1 * 60 * 60 * 24 * 30 * 4)
+	startTime = now.Add(time.Second * time.Duration(-1*seconds))
 	//changeDate()
 	//return
 	//dir = "/Users/med/mine/goPkgLearn"
 	// 最后50次
 	log := getCommitLog(commitTimes)
-	if len(log) == commitTimes {
+	if len(log) >= commitTimes {
 		util.Infof("commit log 已经够分配")
-		deviceCommit(log)
+		//deviceCommitTime(log)
+		commitTime := deviceCommitTime(log)
+		pushCommitTime(log, commitTime)
+		push(0)
 		return
 	}
+	util.Infof("commit log 共 (%d) 不够分配，自动生成提交记录中...", len(log))
 	baseDir = dir
 	if err := getBranch(); err != nil {
 		util.Errorf("getBranch err (%+v)", err)
@@ -72,10 +81,11 @@ func Run(dir string) {
 		//	continue
 		//}
 		getTime()
-		if err := gitPush("./", branch, f); err != nil {
+		if err := addCommit("./", branch, f); err != nil {
 			return
 		}
 	}
+	push(0)
 }
 
 func addFile() (f file.File, err error) {
@@ -92,7 +102,7 @@ func addFile() (f file.File, err error) {
 }
 
 // 提交修改内容到git
-func gitPush(medSdkDir, branch string, f file.File) (err error) {
+func addCommit(medSdkDir, branch string, f file.File) (err error) {
 	util.Infof("正在提交代码...")
 	err = util.RunCmd("git", "add", "-A")
 	if err != nil {
@@ -106,7 +116,7 @@ func gitPush(medSdkDir, branch string, f file.File) (err error) {
 		date := startTime.Unix()
 		dateString := fmt.Sprintf("--date=%d", date)
 		err = util.RunCmd("git", "commit", msgString, dateString)
-		changeDate()
+		changeDate("", "")
 		if err != nil {
 			util.Errorf("git commit err (%+v)", err)
 			return
@@ -115,7 +125,6 @@ func gitPush(medSdkDir, branch string, f file.File) (err error) {
 		util.Infof("无改动文件")
 		return
 	}
-	push(0)
 	return
 }
 
@@ -125,8 +134,8 @@ func push(restart int64) {
 		return
 	}
 	restart++
-	// 10s 内没push 成功就重试
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	// 30s 内没push 成功就重试
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 	err := util.RunCmdCtx(ctx, "git", "push", "-f", "origin", branch)
 	if err != nil {
@@ -204,25 +213,18 @@ func getTime() {
 // 如果以前的commit 够用了，则直接随机分配
 //git log -n 5 --pretty=format:"%cI | %H | %s" > abc.txt
 func getCommitLog(times int) (res []commit) {
-	err := util.RunCmd("git", "log", "-n", strconv.Itoa(times), "--pretty=format:\"{\\\"date\\\":\\\"%cI\\\",\\\"hash\\\":\\\"%H\\\",\\\"msg\\\":\\\"%s\\\"}\" > commit.log")
+	pwd, _ := file.GetCurrentPath()
+	pretty := fmt.Sprintf("--pretty=format:{\"date\":\"%%cI\",\"hash\":\"%%H\"}")
+	r, err := util.RunCmdRetCD(pwd, "git", "log", "-n", strconv.Itoa(times), pretty)
 	if err != nil {
 		util.Errorf("git log err (%+v)", err)
 		return
 	}
-	// 读取
-	f, err := os.Open("commit.log")
-	if err != nil {
-		panic(err)
-	}
-	defer f.Close()
-	rd := bufio.NewReader(f)
-	for {
-		line, err := rd.ReadBytes('\n') //以'\n'为结束符读入一行
-		if err != nil || io.EOF == err {
-			break
-		}
+	split := strings.Split(r, "\n")
+	for i, s := range split {
+		util.Infof("commit %d: %s)", i, s)
 		r := commit{}
-		if err = json.Unmarshal(line, &r); err != nil {
+		if err = json.Unmarshal([]byte(s), &r); err != nil {
 			util.Errorf("Unmarshal err (%+v)", err)
 			return
 		}
@@ -231,16 +233,47 @@ func getCommitLog(times int) (res []commit) {
 	return
 }
 
-func deviceCommit(list []commit)  {
-	l :=  len(list)
+func deviceCommitTime(list []commit) (timeList []int) {
+	l := len(list)
 	// 4个月
-	total := 60 * 60 * 24 * 30 * 4
-	timeList := []int{total}
+	total := seconds
+	timeList = []int{}
 	for i := 0; i < len(list); i++ {
+		timeList = append(timeList, total)
 		reduce := util.DoubleAverage(l, total)
-		total-= reduce
+		total -= reduce
 		l--
-		println(reduce)
-		timeList = append(timeList, total)
 	}
-}
+	fmt.Printf("%+v", timeList)
+	if timeList[len(timeList)-1] > 60*60*24*3 || timeList[len(timeList)-1] < 60*60 {
+		util.Infof("最后一次分配超过3天，重新分配...")
+		return deviceCommitTime(list)
+	}
+	util.Infof("时间切分完成")
+	return
+}
+
+func pushCommitTime(commitList []commit, timeList []int) {
+	lc, lt := len(commitList), len(timeList)
+	if lc != lt {
+		util.Errorf("lc(%d) != lt (%d)", lc, lt)
+		panic("出错啦，长度咋不相等呢？")
+		return
+	}
+	// 时间反着得
+	// 这里不能开协程
+	//eg := errgroup.Group{}
+	for i, c := range timeList {
+		util.Infof("=========== 修改第 %d 次开始 ===========", i+1)
+		format := time.Now().Add(time.Second * time.Duration(c*-1)).Format("2006-01-02 15:04:05")
+		//eg.Go(func() error {
+			changeDate(commitList[i].Hash, format)
+			//return nil
+		//})
+	}
+	//if err := eg.Wait(); err != nil {
+	//	util.Errorf("errgroup err (%+v)", err)
+	//	return
+	//}
+	return
+}

git/commit.log

@@ -3,7 +3,7 @@ package git
 import "testing"
 
 func Test_getCommitLog(t *testing.T)  {
-	getCommitLog(10)
+	getCommitLog(22)
 }
 
 func Test_Run(t *testing.T)  {

git/git.go

@@ -4,5 +4,5 @@ go 1.15
 
 require (
 	github.com/fatih/color v1.12.0
-	github.com/shopspring/decimal v1.2.0
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 )

git/git_test.go

@@ -4,8 +4,8 @@ github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
-github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

git/mainFile/mit.log

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 go install
-cd /Users/med/mine/github/GoWeb
+cd /Users/wanna/mine/github/goCms
 autoAddCommit

go.mod

@@ -60,6 +60,14 @@ func RunCmdRetCD(cd, name string, arg ...string) (out string, err error) {
 	return
 }
 
+func JustRun(cd, name string, arg ...string) (err error) {
+	logf("CMD: %s", strings.Join(append([]string{name}, arg...), " "))
+	cmd := exec.Command(name, arg...)
+	cmd.Dir = cd
+	err = cmd.Run()
+	return
+}
+
 func logf(format string, args ...interface{}) {
 	fmt.Printf(format+"\n", args...)
 }
@@ -73,13 +81,14 @@ func Errorf(format string, args ...interface{}) {
 }
 
 //二倍均值算法,count剩余个数,amount剩余时间
+// 间隔在 5小时 到 3天之间
 func DoubleAverage(count, total int) int {
 	if count == 1 {
 		//返回剩余时间
 		return total
 	}
-	// 提交间隔至少 1h
-	min := 60 * 60
+	// 提交间隔至少 5h
+	min := 60 * 60 * 5
 	//计算最大可用时间,min最小是1分钱,减去的min,下面会加上,避免出现0分钱
 	max := total - min*count
 	//计算最大可用平均值
@@ -90,5 +99,8 @@ func DoubleAverage(count, total int) int {
 	rand.Seed(time.Now().UnixNano())
 	//加min是为了避免出现0值,上面也减去了min
 	x := rand.Intn(avg2) + min
+	if x > 60*60*24*3 {
+		return DoubleAverage(count, total)
+	}
 	return x
-}
+}