Fix the issue of whether the submission has been synchronized with the remote.

Author: xusenlin

frontend/src/components/branch/Index.tsx

@@ -4,19 +4,20 @@ import {State} from "../../store";
 import React, {useState, useRef, useMemo, useEffect} from "react";
 import {useDispatch, useSelector} from "react-redux";
 import {Button, Input, Space, Drawer, Empty} from "antd";
-import {AddBranch,GetAllBranch} from "../../../wailsjs/go/repository/Repository"
+import {AddBranch, GetAllBranch, GetLocalBranch} from "../../../wailsjs/go/repository/Repository"
 import {repository} from "../../../wailsjs/go/models"
 import {setOpenRepositoryBranch} from "../../store/sliceSetting";
 import {warning} from "../../utils/common"
 import MergeDialog from "./mergeDialog"
+import {setAllBranch} from "../../store/sliceMain";
 
 
 const Branch = () => {
   const limit = 20
 
   const dispatch = useDispatch();
-  const [branch,setBranch] = useState<repository.Branch[]>([]);
-
+  // const [branch,setBranch] = useState<repository.Branch[]>([]);
+  const branch = useSelector((state: State) => state.main.currentlyRepositoryLocalBranch);
   const selectedRepositoryId = useSelector((state: State) => state.main.selectedRepositoryId);
   const showRepositoryBranch = useSelector((state: State) => state.setting.showRepositoryBranch);
   const mergeDialogComponentRef = useRef<{ OpenMergeDialog: (branchName: string) => void }>(null);
@@ -25,25 +26,26 @@ const Branch = () => {
   const [keyword,setKeyword] = useState<string>("")
   const computedBranch = useMemo(() => (branch.filter(r=>r.name.indexOf(keyword)!==-1)), [keyword,branch]);
 
-  const getAllBranch = () => {
-    if(!selectedRepositoryId){
-      return
-    }
-    GetAllBranch().then(b=>{
-      setBranch(b||[])
-    }).catch(e=>{
-      warning(JSON.stringify(e))
-    })
-  }
-  useEffect(() => {
-    getAllBranch()
-  }, [selectedRepositoryId]);
+  // const getAllBranch = () => {
+  //   if(!selectedRepositoryId){
+  //     return
+  //   }
+  //   GetAllBranch().then(b=>{
+  //     setBranch(b||[])
+  //   }).catch(e=>{
+  //     warning(JSON.stringify(e))
+  //   })
+  // }
+  // useEffect(() => {
+  //   getAllBranch()
+  // }, [selectedRepositoryId]);
 
 
   const addBranch = async () => {
     try {
       await AddBranch(branchName)
-      getAllBranch()
+      const b = await GetLocalBranch()
+      dispatch(setAllBranch(b))
       setBranchName("")
     } catch (e) {
       console.log(e)

frontend/src/components/history/Item.tsx

@@ -42,7 +42,7 @@ const Item = (props: { l: repository.Commit, nextHash: string }) => {
           size="small"
           className={props.l.hash === commitId ? 'active-history-card-head' : ''}
           headStyle={{background: props.l.hash === commitId ? themeColor : "#fff"}}
-          title={<Badge status={props.l.unRemoteSync ? 'warning':'success'} text={props.l.hash.substring(0, hashLength)}/>}
+          title={<Badge status={props.l.isRemoteSync ? 'success':'warning'} text={props.l.hash.substring(0, hashLength)}/>}
           extra={extra}
           style={{marginBottom: 10}}
       >

frontend/wailsjs/go/models.ts

@@ -57,7 +57,7 @@ export namespace repository {
 	    message: string;
 	    treeHash: string;
 	    parentHashes: string;
-	    unRemoteSync: boolean;
+	    isRemoteSync: boolean;
 
 	    static createFrom(source: any = {}) {
 	        return new Commit(source);
@@ -71,7 +71,7 @@ export namespace repository {
 	        this.message = source["message"];
 	        this.treeHash = source["treeHash"];
 	        this.parentHashes = source["parentHashes"];
-	        this.unRemoteSync = source["unRemoteSync"];
+	        this.isRemoteSync = source["isRemoteSync"];
 	    }
 
 		convertValues(a: any, classs: any, asMap: boolean = false): any {

frontend/wailsjs/go/repository/Repository.d.ts

@@ -38,6 +38,8 @@ export function GitPull():Promise<string>;
 
 export function GitPush():Promise<string>;
 
+export function IsRemoteRepo():Promise<boolean>;
+
 export function MergeCommit(arg1:string,arg2:string):Promise<string>;
 
 export function MergeRebase(arg1:string,arg2:string):Promise<string>;

frontend/wailsjs/go/repository/Repository.js

@@ -74,6 +74,10 @@ export function GitPush() {
   return window['go']['repository']['Repository']['GitPush']();
 }
 
+export function IsRemoteRepo() {
+  return window['go']['repository']['Repository']['IsRemoteRepo']();
+}
+
 export function MergeCommit(arg1, arg2) {
   return window['go']['repository']['Repository']['MergeCommit'](arg1, arg2);
 }

repository/commit.go

@@ -20,39 +20,33 @@ type Commit struct {
 	Message      string    `json:"message"`
 	TreeHash     string    `json:"treeHash"`
 	ParentHashes string    `json:"parentHashes"`
-	UnRemoteSync bool      `json:"unRemoteSync"`
+	IsRemoteSync bool      `json:"isRemoteSync"`
 }
 
 func (r *Repository) Commits(branch string) ([]Commit, error) {
 	if branch == "" {
 		return nil, errors.New("branch name error")
 	}
-	fmt.Println(branch)
+
 	var logs []Commit
 	//f := fmt.Sprintf("--format=format:%s", `{"hash":"%H","author":"%an","message":"%s","treeHash":"%T","parentHashes":"%P","committer":{"name":"%cn","email":"%ce","when":"%cr"}},`)
 	f := fmt.Sprintf("--format=format:%s", `%H<||>%an<||>%s<||>%T<||>%P<||>%cn<||>%ce<||>%cr<|n|>`)
 	out, err := utils.RunCmdByPath(r.Path, "git", "log", branch, f, "-n 60")
 	if err != nil {
 		return nil, err
 	}
-
-	unRemoteSyncOut, err := utils.RunCmdByPath(r.Path, "git", "remote", "-v")
+	isRemoteRepo, err := r.IsRemoteRepo()
 	if err != nil {
 		return nil, err
 	}
-	if strings.TrimSpace(unRemoteSyncOut) != "" {
+	var noRemoteSyncHash string
+	if isRemoteRepo {
 		arg := fmt.Sprintf("origin/%s...%s", branch, branch)
-		unRemoteSyncOut, err = utils.RunCmdByPath(r.Path, "git", "log", `--pretty=format:"%H"`, arg)
+		noRemoteSyncHash, err = utils.RunCmdByPath(r.Path, "git", "log", `--pretty=format:"%H"`, arg)
 		if err != nil {
 			return nil, err
 		}
 	}
-	//jsonStr := fmt.Sprintf("[%s]", strings.TrimRight(out, ","))
-
-	//err = json.Unmarshal([]byte(jsonStr), &logs)
-	//if err != nil {
-	//	return nil, err
-	//}
 	outs := strings.Split(out, "<|n|>")
 	for _, r := range outs {
 		rows := strings.Split(strings.TrimSpace(r), "<||>")
@@ -61,6 +55,12 @@ func (r *Repository) Commits(branch string) ([]Commit, error) {
 		}
 		//`{"hash":"%H","author":"%an","message":"%s","treeHash":"%T","parentHashes":"%P","committer":{"name":"%cn","email":"%ce","when":"%cr"}},`
 		hash := strings.TrimSpace(rows[0])
+
+		var isRemoteSync bool
+		if isRemoteRepo {
+			isRemoteSync = !strings.Contains(noRemoteSyncHash, hash)
+		}
+
 		logs = append(logs, Commit{
 			Hash:         hash,
 			Author:       rows[1],
@@ -72,7 +72,7 @@ func (r *Repository) Commits(branch string) ([]Commit, error) {
 				Email: rows[6],
 				When:  rows[7],
 			},
-			UnRemoteSync: strings.Contains(unRemoteSyncOut, hash),
+			IsRemoteSync: isRemoteSync,
 		})
 	}
 

repository/utils.go

@@ -5,6 +5,7 @@ import (
 	"git-helper/utils"
 	"os/exec"
 	sysRuntime "runtime"
+	"strings"
 )
 
 func (r *Repository) OpenTerminal() error {
@@ -49,3 +50,15 @@ func (r *Repository) OpenFileManage() error {
 func (r *Repository) RunCmdInRepository(cmd string, arg []string) (string, error) {
 	return utils.RunCmdByPath(r.Path, cmd, arg...)
 }
+func (r *Repository) IsRemoteRepo() (bool, error) {
+
+	out, err := utils.RunCmdByPath(r.Path, "git", "remote", "-v")
+	if err != nil {
+		return false, err
+	}
+
+	if strings.TrimSpace(out) == "" {
+		return false, nil
+	}
+	return true, nil
+}