修复一些文件

This commit is contained in:
2509_92447106 committed 2026-11-13 22:09:17 +08:00
1 parent f1787dff9d
commit 9293fee3bf
3 files changed
+439 -164

No files matched your search

+123 -49
View File
@@ -1,35 +1,33 @@
@echo off
REM autogit.bat —— 提交并推送到所有已配置的仓库(Windows 版一键多仓同步)
REM autogit.bat —— 交互式提交(Windows)
REM
REM 用法:
REM git.bat autogit 自动生成提交信息并推送所有仓库
REM git.bat autogit -m "提交信息" 指定提交信息
REM git.bat autogit -m "..." -n 只提交,不推送
REM git.bat autogit --dry-run 只看会提交什么,不动仓库
REM git.bat autogit 交互模式(推荐)
REM git.bat autogit -m "信息" 跳过信息输入,其余仍交互
REM git.bat autogit --dry-run 只看会提交什么,不动仓库
REM git.bat autogit -y 全部确认跳过(配合 -m 可全自动)
REM
REM 多仓库:遍历 git remote 里的每一个远程,依次 push。
REM 加仓库: git remote add gitee git@github.com:user/repo.git
REM
REM 自动跳过(永不提交):dist\ build\ bin\ obj\ .GC\ node_modules\ 等
REM 交互流程:显示改动 → 逐个选仓库 → 输入提交信息 → 确认 → 执行
REM 自动跳过:dist\ build\ bin\ obj\ .GC\(任意层级)
setlocal enabledelayedexpansion
chcp 65001 >nul 2>&1
set "ROOT_DIR=%~1"
if "%ROOT_DIR%"=="" set "ROOT_DIR=%CD%"
cd /d "%ROOT_DIR%" 2>nul || (echo !! 目录不存在:%ROOT_DIR% & exit /b 1)
cd /d "%ROOT_DIR%" 2>nul || (echo !! 目录不存在 & exit /b 1)
shift
set "MSG="
set "PUSH=1"
set "DRY=0"
set "ASSUME_YES=0"
:parse
if "%~1"=="" goto parsed
if /i "%~1"=="-m" ( set "MSG=%~2" & shift & shift & goto parse )
if /i "%~1"=="--message" ( set "MSG=%~2" & shift & shift & goto parse )
if /i "%~1"=="-n" ( set "PUSH=0" & shift & goto parse )
if /i "%~1"=="--no-push" ( set "PUSH=0" & shift & goto parse )
if /i "%~1"=="--dry-run" ( set "DRY=1" & shift & goto parse )
if /i "%~1"=="-y" ( set "ASSUME_YES=1" & shift & goto parse )
if /i "%~1"=="--yes" ( set "ASSUME_YES=1" & shift & goto parse )
echo 未知参数:%~1
exit /b 1
:parsed
@@ -41,62 +39,138 @@ if errorlevel 1 ( echo !! 这里不是 git 仓库:%CD% & exit /b 1 )
for /f "delims=" %%b in ('git rev-parse --abbrev-ref HEAD 2^>nul') do set "BRANCH=%%b"
if "%BRANCH%"=="" ( echo !! 当前不在任何分支上 & exit /b 1 )
REM ---------- 1. 确保忽略规则 ----------
if exist ".gitignore" (
for %%p in ("dist/" "build/" "bin/" "obj/" ".GC/") do (
findstr /x /c:%%p ".gitignore" >nul 2>&1
if errorlevel 1 (
echo %%p>>".gitignore"
echo + .gitignore 追加 %%~p
set "REMOTES="
for /f "delims=" %%r in ('git remote') do set "REMOTES=!REMOTES! %%r"
if "!REMOTES!"=="" ( echo !! 没有配置任何远程仓库 & exit /b 1 )
echo ==============================================
echo 仓库:%CD%
echo 分支:%BRANCH%
echo ==============================================
echo.
echo ==^> 会被排除的构建产物:
for %%d in (dist build bin obj .GC) do (
for /f %%c in ('git ls-files -- "*%%d/*" 2^>nul ^| find /c /v ""') do (
if not "%%c"=="0" echo %%d\ %%c 个文件
)
)
echo.
echo ==^> 待提交的改动:
git status --short | findstr /v /r "\\dist\\ \\build\\ \\bin\\ \\obj\\ \\.GC\\" | more +0
echo.
if "%DRY%"=="1" (
echo ==^> --dry-run:未做任何修改
exit /b 0
)
REM ---------- 2. 选择仓库 ----------
echo ==^> 选择要推送的仓库(y=推送 / n=跳过 / a=全部 / q=退出)
echo.
for %%r in (!REMOTES!) do (
for /f "delims=" %%u in ('git remote get-url %%r 2^>nul') do echo %%r %%u
)
echo.
set "SELECTED="
for %%r in (!REMOTES!) do (
if "!ASSUME_YES!"=="1" (
set "SELECTED=!SELECTED! %%r"
echo [自动] %%r
) else (
set "ANS="
set /p "ANS= 推送到 %%r (y/n/a/q) "
if /i "!ANS!"=="a" (
set "SELECTED=!REMOTES!"
goto selected_done
) else if /i "!ANS!"=="q" (
echo 已取消
exit /b 0
) else if /i "!ANS!"=="y" (
set "SELECTED=!SELECTED! %%r"
echo -^> 推送
) else (
echo -^> 跳过
)
)
)
:selected_done
REM ---------- 2. 收集改动 ----------
echo ==^> 检查改动(分支 %BRANCH%)
git add -A 2>nul
set "PUSH=1"
if "!SELECTED!"=="" (
echo.
echo !! 没有选择任何仓库,只提交到本地不推送
set "PUSH=0"
)
REM ---------- 3. 提交信息 ----------
echo.
if "%MSG%"=="" (
echo ==^> 请输入提交信息(留空自动生成)
set "MSG="
set /p "MSG= ^> "
)
if "%MSG%"=="" (
for /f "tokens=1-3 delims=/ " %%a in ('date /t') do set "D=%%a-%%b-%%c"
set "MSG=更新项目(!D!)"
echo (自动生成:!MSG!)
)
REM ---------- 4. 确认 ----------
echo.
echo ==============================================
echo 提交信息:%MSG%
if "%PUSH%"=="1" (
echo 推送到: !SELECTED!
) else (
echo 推送到: (仅本地提交)
)
echo ==============================================
if not "%ASSUME_YES%"=="1" (
set "OK="
set /p "OK=确认执行?(y/N) "
if /i not "!OK!"=="y" ( echo 已取消 & exit /b 0 )
)
REM ---------- 5. 执行 ----------
echo.
echo ==^> 整理索引
for %%d in (dist build bin obj .GC) do (
for /f "delims=" %%f in ('git ls-files "%%d" 2^>nul') do (
git rm -r --cached --quiet "%%d" 2>nul
echo - 从索引移除 %%d\(本地文件保留)
for /f "delims=" %%f in ('git ls-files -- "*%%d/*" 2^>nul') do (
git rm -r --cached --quiet -- "*%%d/*" 2>nul
echo - 移出 %%d\ 内的文件(本地保留)
goto nextdir_%%d
)
:nextdir_%%d
)
git add -A 2>nul
for /f %%n in ('git diff --cached --name-only ^| find /c /v ""') do set "STAGED=%%n"
if "%STAGED%"=="0" (
echo ==^> 没有需要提交的改动
echo ==^> 没有可提交的改动
) else (
echo ==^> 待提交 %STAGED% 个文件
git commit -q -m "%MSG%"
echo ==^> 已提交 %STAGED% 个文件
git log --oneline -1
)
if "%DRY%"=="1" (
echo ==^> --dry-run:到此为止
REM ---------- 6. 推送 ----------
if "%PUSH%"=="0" (
echo.
echo ==^> 仅本地提交,未推送
exit /b 0
)
REM ---------- 3. 提交 ----------
if not "%STAGED%"=="0" (
if "%MSG%"=="" (
for /f "tokens=1-3 delims=/ " %%a in ('date /t') do set "D=%%a-%%b-%%c"
set "MSG=更新项目(!D!)"
)
git commit -q -m "%MSG%"
echo ==^> 已提交:%MSG%
) else (
echo ==^> 跳过提交(无改动)
)
REM ---------- 4. 推送到所有远程 ----------
if "%PUSH%"=="0" ( echo ==^> -n 指定不推送 & exit /b 0 )
for /f "delims=" %%r in ('git remote') do (
set "FAILED=0"
for %%r in (!SELECTED!) do (
echo.
echo ==^> 推送到 %%r
git push -u %%r "%BRANCH%" 2>&1
if errorlevel 1 (
echo !! 推送失败。若确认以本地为准:
echo !! 失败。若确认以本地为准:
echo git push --force-with-lease %%r %BRANCH%
set "FAILED=1"
) else (
@@ -106,8 +180,8 @@ for /f "delims=" %%r in ('git remote') do (
echo.
if "%FAILED%"=="1" (
echo ==^> 完成,但有仓库推送失败
echo ==^> 完成,有仓库推送失败
exit /b 1
)
echo ==^> 全部仓库已同步
echo ==^> 全部完成
exit /b 0