代码管理的小技巧

#!/bin/bash

path=$(pwd);
basename=$(basename "$path");

# 当前迭代的分支名称
#dev="feature_v4.12.1"; # 烈榛 壹钱包券码发放
#dev="feature_v4.12.7"; # 烈榛 兑换码数量限制
dev="feature_v5.1.3"; # 新权益 维信扣款时间调整

# 获取当前默认分支
function master() {
  [[ $(pwd) =~ billbear-common ]] && echo "2.0.0" || git remote show origin 2>/dev/null | grep "HEAD branch" | awk '{print $NF}'
}
function branch() {
  if [[ $(pwd) =~ billbear-third-api ]] && [[ $dev =~ 4.12.1 || $dev =~ 4.12.3 ]]; then
    echo "${dev}_lz"
  else
    echo "$dev"
  fi
}

# push
if [ "push" = $1 ]; then
#  git checkout dev && git pull --rebase && git merge $(branch) --message "merge $(branch) into dev" && git push;
  git checkout test && git pull --rebase && git merge $(branch) --message "merge $(branch) into test" && git push;
  git checkout $(branch);
fi

# 快捷操作
if [ "biubiu" = $1 ]; then
#  git merge --abort;
  git checkout $(master) && git pull --rebase && git checkout -b $(branch);
#  git stash && git checkout $(master) && git pull --rebase && git checkout -b $(branch) && git stash pop;
#  git checkout $(master) && git pull --rebase > /dev/null && git log $(master)..$(branch); # 检查发版
fi

# 切分支
if [ "dev" = $1 ]; then
  git checkout dev && git pull --rebase;
fi
if [ "test" = $1 ]; then
  git checkout test && git pull --rebase;
fi
if [ "master" = $1 ]; then
  git checkout $(master) && git pull --rebase;
fi
if [ "feature" = $1 ]; then
  git checkout $(branch) && git pull --rebase && git pull origin $(master);
fi

# 批量
if [ "batch" = $1 ]; then
  for dir in */; do
    cd "$path/$dir" || exit;
#    /Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3/bin/mvn clean
#    find ./ -type f -name "*.iml" -delete;
    git checkout $(master) &> /dev/null && git pull --rebase &> /dev/null;

# 输出本期迭代所有改动，并比较与主分支的差异提交个数
    git checkout $(branch) &> /dev/null && echo $(basename "$dir") && git rev-list --count $(master)..$(branch);
#    git checkout $(master) &> /dev/null;
  done
fi

# deploy
if [ "deploy" = $1 ]; then
  if [ "feature_v4.12.1" = $(branch) ]; then
    cd /Users/daijun/IdeaProjects/ka/ccp-newmall/ccp-newmall-admin/ccp-newmall-admin-facade-stub
    /Users/daijun/Library/Java/JavaVirtualMachines/corretto-17.0.7/Contents/Home/bin/java -Dmaven.multiModuleProjectDirectory=/Users/daijun/IdeaProjects/ka/ccp-newmall/ccp-newmall-admin/ccp-newmall-admin-facade-stub -Dmaven.home=/Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3 -Dclassworlds.conf=/Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3/bin/m2.conf -Dmaven.ext.class.path=/Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven-event-listener.jar -javaagent:/Applications/IntelliJ\ IDEA.app/Contents/lib/idea_rt.jar=56027:/Applications/IntelliJ\ IDEA.app/Contents/bin -Dfile.encoding=UTF-8 -classpath /Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3/boot/plexus-classworlds.license:/Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3/boot/plexus-classworlds-2.6.0.jar org.codehaus.classworlds.Launcher -Didea.version=2021.3.3 -s /Users/daijun/.m2/settings_billbear1.xml deploy
    cd /Users/daijun/IdeaProjects/ka/billbear-third-api/billbear-yiqianbao-api
    /Users/daijun/Library/Java/JavaVirtualMachines/corretto-17.0.7/Contents/Home/bin/java -Dmaven.multiModuleProjectDirectory=/Users/daijun/IdeaProjects/ka/billbear-third-api/billbear-yiqianbao-api -Dmaven.home=/Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3 -Dclassworlds.conf=/Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3/bin/m2.conf -Dmaven.ext.class.path=/Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven-event-listener.jar -javaagent:/Applications/IntelliJ\ IDEA.app/Contents/lib/idea_rt.jar=51816:/Applications/IntelliJ\ IDEA.app/Contents/bin -Dfile.encoding=UTF-8 -classpath /Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3/boot/plexus-classworlds.license:/Applications/IntelliJ\ IDEA.app/Contents/plugins/maven/lib/maven3/boot/plexus-classworlds-2.6.0.jar org.codehaus.classworlds.Launcher -Didea.version=2021.3.3 -s /Users/daijun/.m2/settings_billbear1.xml deploy
  fi
fi

使用方法

• 对于微服务项目，直接在项目任意目录或者文件上，右击，按图一的方式选择操作，即可完成代码的管理
• 其他项目可以通过软链接的方式，将这个shell文件链接到项目下，通过定义多个branch方式，方便知道当前在开发哪些迭代