chore: rsync-vimrc.sh use git worktree

Author: jiangyinzuo

root/.vim/doc/git-flow.cnx

@@ -35,10 +35,19 @@ git add -p会把文件的修改分成若干个更改块(hunks)，每个片段都
 
 -------------------------------------------------------------------------------
 *git-worktree* 多分支同时开发
+
 好处:
 1. 依赖隔离：`node_modules`被写入.gitignore中，假如多分支依赖的`node_modules`
 不同，`git stash`不会改变`node_modules`
 
 列举worktree >
 	git worktree list
 <
+
+应用场景: 本地服务器+远程无法访问github的服务器同时修改提交 ~
+
+在gpudb-project-ictdb中，
+git worktree add -b kiwi-dev ../gpudb-project-ictdb-kiwi-dev
+之后本地都在gpudb-project-ictdb文件夹下开发，远程在gpudb-project-ictdb-kiwi-dev
+文件夹下开发，rsync仅在gpudb-project-ictdb-kiwi-dev下拉取/推送文件
+

root/.vim/doc/http-proxy.cnx

@@ -18,7 +18,7 @@ sudo systemctl start squid
 
 Warning: remote port forwarding failed for listen port 3128 ~
 >
-	netstat -tulnp | grep 3128
+	sudo netstat -tulnp | grep 3128
 <
 找到占用端口的进程（可能是之前的ssh异常退出），然后kill
 

root/scripts/checkrepo.py

@@ -2,26 +2,40 @@
 
 import git
 import sys
+import os
 
 
-def check_git_status(repo_path='.'):
+def is_git_worktree(repo_path):
+    """
+    检查指定仓库是否为 Git worktree
+    """
+    git_path = os.path.join(repo_path, '.git')
+    if os.path.isfile(git_path):
+        with open(git_path, 'r') as file:
+            content = file.read()
+            if content.startswith('gitdir:'):
+                return True
+    return False
+
+
+def check_git_status(repo_path='.') -> bool:
     try:
         repo = git.Repo(repo_path)
     except git.InvalidGitRepositoryError:
         print("无效的Git仓库：", repo_path)
-        sys.exit(1)
+        return False
 
     # 检查是否有未提交的更改
     if repo.is_dirty(untracked_files=True):
         print("存在未提交的更改或未跟踪的文件")
         print(repo.git.status())
-        sys.exit(1)
+        return False
 
     # 检查所有本地分支
     for branch in repo.branches:
         if branch.tracking_branch() is None:
             print(f"分支 {branch} 没有追踪的远程分支。")
-            sys.exit(1)
+            return False
 
         # 比较本地分支和远程分支
         commits_ahead = list(repo.iter_commits(
@@ -30,15 +44,45 @@ def check_git_status(repo_path='.'):
             f'{branch.tracking_branch()}..{branch}'))
 
         if commits_ahead:
-            print(f"分支 {branch} 落后于 {branch.tracking_branch()} {len(commits_ahead)} 个提交。")
+            print(
+                f"分支 {branch} 落后于 {branch.tracking_branch()} {len(commits_ahead)} 个提交。")
             sys.exit(1)
         if commits_behind:
-            print(f"分支 {branch} 超前于 {branch.tracking_branch()} {len(commits_behind)} 个提交。")
-            sys.exit(1)
+            print(
+                f"分支 {branch} 超前于 {branch.tracking_branch()} {len(commits_behind)} 个提交。")
+            return False
 
     print("所有检查完成，本地仓库与远程仓库同步。")
+    return True
 
 
 if __name__ == "__main__":
-    import sys
-    check_git_status(sys.argv[1])
+    import argparse
+    # checkrepo.py status --repo /path/to/repo
+    # checkrepo.py isworktree --repo /path/to/repo
+    arg_parser = argparse.ArgumentParser(
+        description='检查 Git 仓库状态',
+        prog=__file__)
+    arg_parser.add_argument(
+        'command', help="""
+            status: 检查 Git 仓库状态
+            isworktree: 检查是否为 Git worktree
+            safersync: 同时检查 Git 仓库状态和是否为 Git worktree，仅当Git仓库没有未提交更改、且为Git worktree时，返回0
+            """, choices=['status', 'isworktree', 'safersync'])
+    arg_parser.add_argument(
+        '--repo', help='Git 仓库路径', default='.')
+
+    args = arg_parser.parse_args()
+    match args.command:
+        case 'status':
+            if not check_git_status(args.repo):
+                sys.exit(1)
+        case 'isworktree':
+            print(is_git_worktree(args.repo))
+        case 'safersync':
+            if not (is_git_worktree(args.repo) and check_git_status(args.repo)):
+                print("不是 Git worktree")
+                sys.exit(1)
+        case _:
+            print("未知命令")
+            sys.exit(1)

tools/rsync-vimrc.sh

@@ -6,6 +6,17 @@ _help() {
 	exit 1
 }
 
+_git_worktree_origin_dir() {
+	gitdir=$(git rev-parse --git-dir)
+	if [[ "$gitdir" == '.git' ]]; then
+		echo "not in worktree"
+		exit 1
+	fi
+	# /root/vimrc/.git/worktrees/vimrc-kiwi -> /root/vimrc
+	# 去掉.git/worktrees及其后面的内容
+	origin_dir=$(echo $gitdir | sed 's/\.git\/worktrees\/.*//')
+}
+
 host=$1
 if [ -z "$host" ]; then
 	_help
@@ -21,26 +32,35 @@ case $1 in
 		;;
 esac
 
+# 获取当前脚本所在git仓库的根目录
+worktree_dir=$(git rev-parse --show-toplevel)
+worktree_basename=$(basename $worktree_dir)
+echo "worktree_dir: $worktree_dir"
+cd $worktree_dir
+_git_worktree_origin_dir
+echo "origin_dir: $origin_dir"
+
 case $direction in
 	"to")
 		# 在远程主机上执行checkrepo.py脚本，若返回非0值，则退出
-		ssh $host "python3 ~/vimrc/root/scripts/checkrepo.py ~/vimrc"
+		ssh $host "python3 ~/vimrc/root/scripts/checkrepo.py safersync --repo $worktree_dir"
 		# 如果没有指定-f参数，且返回非0值，则退出
 		if [[ $? -ne 0 && "$force" != '-f' ]]; then
 			echo -e "\033[31mcheckrepo.py failed\033[0m"
 			exit 1
 		fi
-		rsync-git . $host:~/vimrc
+		rsync-git $worktree_dir/ $host:~/$worktree_basename
+		rsync-git $origin_dir $host:~/vimrc
 		;;
 	"from")
 		# 在本地主机上执行checkrepo.py脚本，若返回非0值，则退出
-		python3 ~/vimrc/root/scripts/checkrepo.py ~/vimrc
+		python3 ~/vimrc/root/scripts/checkrepo.py safersync --repo $worktree_dir
 		# 如果没有指定-f参数，且返回非0值，则退出
 		if [[ $? -ne 0 && "$force" != '-f' ]]; then
 			echo -e "\033[31mcheckrepo.py failed\033[0m"
 			exit 1
 		fi
-		rsync-git $host:~/vimrc ~
+		rsync-git $host:~/$worktree_basename/ $worktree_dir/
 		;;
 	*)
 		_help