zen-gitsync 2.16.13 → 2.16.14

package/src/ui/server/routes/git.js

@@ -95,14 +95,45 @@ export function registerGitRoutes({
         if (!branch) {
           throw new HttpError(400, '分支名称不能为空');
         }
-      
+
+        let finalBranch = branch;
+
+        // 远程分支（如 origin/xxx）：直接 checkout 远程引用会进入 detached HEAD，
+        // 需要先解析出同名本地分支——已存在则直接切换，不存在则基于远程分支创建并跟踪。
+        if (branch.includes('/')) {
+          const { stdout: remoteRef } = await execGitCommand(
+            ['rev-parse', '--verify', '--quiet', `refs/remotes/${branch}`],
+            { ignoreError: true, log: false }
+          );
+
+          if (remoteRef.trim()) {
+            // 去掉第一个路径段（远程名），得到本地分支名，支持 origin/feature/x 这类多级名称
+            const localName = branch.substring(branch.indexOf('/') + 1);
+            const { stdout: localRef } = await execGitCommand(
+              ['rev-parse', '--verify', '--quiet', `refs/heads/${localName}`],
+              { ignoreError: true, log: false }
+            );
+
+            if (localRef.trim()) {
+              // 本地已有同名分支，直接切换
+              finalBranch = localName;
+            } else {
+              // 本地没有：创建同名本地分支并跟踪该远程分支
+              await execGitCommand(['checkout', '--track', branch]);
+              clearBranchCache();
+              res.json({ success: true, branch: localName, created: true });
+              return;
+            }
+          }
+        }
+
         // 执行分支切换
-        await execGitCommand(['checkout', branch]);
-      
+        await execGitCommand(['checkout', finalBranch]);
+
         // 清除分支缓存，因为分支已切换
         clearBranchCache();
-      
-        res.json({ success: true });
+
+        res.json({ success: true, branch: finalBranch });
       } catch (error) {
         logger.error('切换分支失败:', error);
         res.status(500).json({ success: false, error: error.message });

package/src/ui/server/routes/git.test.js

@@ -0,0 +1,147 @@
+// Copyright 2026 xz333221
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// src/ui/server/routes/git.js 单元测试。
+// 验证 POST /api/checkout 对远程分支的处理:
+// 选中 origin/xxx 时应切到同名本地分支,不存在则 --track 自动创建,
+// 而不是直接 checkout 远程引用进入 detached HEAD。
+//
+// 测试不真起 Express,直接调 registerGitRoutes 注入 mock app。
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { registerGitRoutes } from './git.js'
+
+/** 最小 express app mock:只实现 get/post + handler 调用 */
+function makeApp() {
+  const handlers = new Map()  // key = "METHOD path" → handler
+  return {
+    get(path, handler) { handlers.set(`GET ${path}`, handler) },
+    post(...args) {
+      // create-branch 等路由带 express.json() 中间件,handler 永远是最后一个参数
+      const path = args[0]
+      const handler = args[args.length - 1]
+      handlers.set(`POST ${path}`, handler)
+    },
+    invoke(method, path, req = { query: {}, body: {} }, res = makeRes()) {
+      const key = `${method} ${path}`
+      const handler = handlers.get(key)
+      assert.ok(handler, `no handler for ${key}`)
+      return handler(req, res, () => {})
+    }
+  }
+}
+function makeRes() {
+  return {
+    statusCode: 200,
+    payload: null,
+    status(c) { this.statusCode = c; return this },
+    json(p) { this.payload = p; return this }
+  }
+}
+
+/** 构造注入依赖,calls 记录所有 git 子命令 */
+function makeDeps(app, execGitCommand) {
+  const calls = []
+  registerGitRoutes({
+    app,
+    execGitCommand: async (args, opts) => { calls.push(args); return execGitCommand(args, opts) },
+    clearBranchCache: () => {}
+  })
+  return calls
+}
+
+// ========== /api/checkout 远程分支处理 ==========
+
+test('checkout: 本地分支 → 直接 checkout,不做远程探测', async () => {
+  const app = makeApp()
+  const calls = makeDeps(app, async () => ({ stdout: '' }))
+  const res = makeRes()
+  await app.invoke('POST', '/api/checkout', { query: {}, body: { branch: 'develop' } }, res)
+  assert.equal(res.statusCode, 200)
+  assert.deepEqual(res.payload, { success: true, branch: 'develop' })
+  assert.deepEqual(calls, [['checkout', 'develop']])
+})
+
+test('checkout: 远程分支 + 本地已存在同名分支 → 切到本地分支', async () => {
+  const app = makeApp()
+  const calls = makeDeps(app, async (args) => {
+    if (args[0] === 'rev-parse' && args.includes('refs/remotes/origin/release-v1')) return { stdout: 'abc123\n' }
+    if (args[0] === 'rev-parse' && args.includes('refs/heads/release-v1')) return { stdout: 'def456\n' }
+    return { stdout: '' }
+  })
+  const res = makeRes()
+  await app.invoke('POST', '/api/checkout', { query: {}, body: { branch: 'origin/release-v1' } }, res)
+  assert.equal(res.statusCode, 200)
+  assert.deepEqual(res.payload, { success: true, branch: 'release-v1' })
+  // 最后一步必须是 checkout 本地分支名,而不是 checkout origin/release-v1(detached HEAD)
+  assert.deepEqual(calls[calls.length - 1], ['checkout', 'release-v1'])
+})
+
+test('checkout: 远程分支 + 本地无同名分支 → checkout --track 自动创建', async () => {
+  const app = makeApp()
+  const calls = makeDeps(app, async (args) => {
+    if (args[0] === 'rev-parse' && args.includes('refs/remotes/origin/release-v1')) return { stdout: 'abc123\n' }
+    if (args[0] === 'rev-parse' && args.includes('refs/heads/release-v1')) return { stdout: '' }  // 本地不存在
+    return { stdout: '' }
+  })
+  const res = makeRes()
+  await app.invoke('POST', '/api/checkout', { query: {}, body: { branch: 'origin/release-v1' } }, res)
+  assert.equal(res.statusCode, 200)
+  assert.deepEqual(res.payload, { success: true, branch: 'release-v1', created: true })
+  assert.deepEqual(calls[calls.length - 1], ['checkout', '--track', 'origin/release-v1'])
+})
+
+test('checkout: 多级远程分支(origin/feature/x)→ 本地名取第一个斜杠之后部分', async () => {
+  const app = makeApp()
+  const calls = makeDeps(app, async (args) => {
+    if (args[0] === 'rev-parse' && args.includes('refs/remotes/origin/feature/x')) return { stdout: 'abc123\n' }
+    if (args[0] === 'rev-parse' && args.includes('refs/heads/feature/x')) return { stdout: '' }
+    return { stdout: '' }
+  })
+  const res = makeRes()
+  await app.invoke('POST', '/api/checkout', { query: {}, body: { branch: 'origin/feature/x' } }, res)
+  assert.equal(res.statusCode, 200)
+  assert.deepEqual(res.payload, { success: true, branch: 'feature/x', created: true })
+  assert.deepEqual(calls[calls.length - 1], ['checkout', '--track', 'origin/feature/x'])
+})
+
+test('checkout: 带斜杠但远程引用不存在(如本地 feature/x)→ 按原名直接 checkout', async () => {
+  const app = makeApp()
+  const calls = makeDeps(app, async (args) => {
+    if (args[0] === 'rev-parse') return { stdout: '' }  // refs/remotes/feature/x 不存在
+    return { stdout: '' }
+  })
+  const res = makeRes()
+  await app.invoke('POST', '/api/checkout', { query: {}, body: { branch: 'feature/x' } }, res)
+  assert.equal(res.statusCode, 200)
+  assert.deepEqual(res.payload, { success: true, branch: 'feature/x' })
+  assert.deepEqual(calls[calls.length - 1], ['checkout', 'feature/x'])
+})
+
+test('checkout: rev-parse 探测抛错 → ignoreError 吞下,按原名 checkout(非 500)', async () => {
+  const app = makeApp()
+  const calls = makeDeps(app, async (args, opts) => {
+    if (args[0] === 'rev-parse') {
+      const err = new Error('Command failed: git rev-parse --verify --quiet refs/remotes/origin/gone')
+      err.code = 128
+      if (opts && opts.ignoreError) return { stdout: '' }
+      throw err
+    }
+    return { stdout: '' }
+  })
+  const res = makeRes()
+  await app.invoke('POST', '/api/checkout', { query: {}, body: { branch: 'origin/gone' } }, res)
+  assert.equal(res.statusCode, 200, '探测失败应降级为普通 checkout,不应 500')
+  assert.deepEqual(calls[calls.length - 1], ['checkout', 'origin/gone'])
+})

package/src/ui/server/routes/gitOps.js

@@ -36,7 +36,15 @@ export function registerGitOpsRoutes({
   setRecentPushStatus
 }) {
   // 提交更改
+  // 锁定文件排除逻辑：提交前检测暂存区中是否有锁定文件，
+  // 如果有则临时 git reset HEAD 取消暂存 → 提交 → 恢复暂存状态。
+  // 这样用户可以从左侧文件列表区域自由操作锁定文件（暂存/撤回），
+  // 但右侧提交时锁定文件不会被提交。
   app.post('/api/commit', express.json(), async (req, res) => {
+    let tempFile = null;
+    // 临时取消暂存的锁定文件列表（提交后需恢复）
+    let unstagedLockedFiles = [];
+
     try {
       const { message, hasNewlines, noVerify } = req.body;
 
@@ -44,7 +52,6 @@ export function registerGitOpsRoutes({
       const commitArgs = ['commit'];
 
       // 如果消息包含换行符，使用文件方式提交
-      let tempFile
       if (hasNewlines) {
         // 创建临时文件存储提交信息
         tempFile = path.join(os.tmpdir(), `commit-msg-${Date.now()}.txt`);
@@ -60,17 +67,114 @@ export function registerGitOpsRoutes({
         commitArgs.push('--no-verify');
       }
 
+      // ====== 锁定文件排除逻辑 ======
+      const lockedFiles = await configManager.getLockedFiles();
+      let skippedLockedFiles = [];
+
+      if (lockedFiles.length > 0) {
+        // 获取当前暂存区文件列表
+        const { stdout: stagedOutput } = await execGitCommand(
+          ['diff', '--cached', '--name-only'], { log: false }
+        );
+        const stagedFiles = stagedOutput.split('\n').filter(Boolean);
+
+        if (stagedFiles.length > 0) {
+          // 获取 Git 根目录，用于将锁定文件的绝对路径转为 git 相对路径
+          let gitRoot;
+          try {
+            const { stdout: rootOut } = await execGitCommand(
+              ['rev-parse', '--show-toplevel'], { log: false }
+            );
+            gitRoot = path.normalize(rootOut.trim());
+          } catch (_) {
+            gitRoot = path.normalize(process.cwd());
+          }
+
+          // 将锁定文件路径统一为 git 相对路径（正斜杠）以便与
+          // git diff --cached --name-only 的输出进行比较
+          function toGitRelative(p) {
+            const normalized = path.normalize(p);
+            const relative = (path.isAbsolute(normalized) && normalized.startsWith(gitRoot))
+              ? path.relative(gitRoot, normalized)
+              : normalized;
+            return relative.replace(/\\/g, '/');
+          }
+
+          const lockedRelativeSet = new Set(lockedFiles.map(toGitRelative));
+
+          // 找出暂存区中的锁定文件
+          unstagedLockedFiles = stagedFiles.filter(
+            f => lockedRelativeSet.has(f.replace(/\\/g, '/'))
+          );
+
+          if (unstagedLockedFiles.length > 0) {
+            // 临时取消暂存锁定文件
+            await execGitCommand(
+              ['reset', 'HEAD', '--', ...unstagedLockedFiles], { log: false }
+            );
+            skippedLockedFiles = unstagedLockedFiles;
+
+            // 检查取消暂存后是否还有可提交的内容
+            const { stdout: remainingStaged } = await execGitCommand(
+              ['diff', '--cached', '--name-only'], { log: false }
+            );
+            if (!remainingStaged.trim()) {
+              // 所有暂存文件都是锁定的 — 恢复暂存状态并返回提示
+              await execGitCommand(
+                ['add', '--', ...unstagedLockedFiles], { log: false }
+              );
+              if (tempFile) {
+                await fs.unlink(tempFile).catch(() => {});
+              }
+              res.json({
+                success: false,
+                error: '所有暂存文件都被锁定，没有可提交的内容',
+                skippedLockedFiles,
+              });
+              return;
+            }
+          }
+        }
+      }
+
       logger.info(`commitArgs ==>`, commitArgs);
       // 执行提交命令
       await execGitCommand(commitArgs);
 
       // 如果使用了临时文件，删除它
-      if (hasNewlines && tempFile) {
+      if (tempFile) {
         await fs.unlink(tempFile).catch(() => {});
       }
 
-      res.json({ success: true });
+      // 恢复锁定文件的暂存状态（保留用户在左侧文件列表中的暂存操作）
+      if (unstagedLockedFiles.length > 0) {
+        try {
+          await execGitCommand(
+            ['add', '--', ...unstagedLockedFiles], { log: false }
+          );
+        } catch (e) {
+          logger.warn('恢复锁定文件暂存状态失败:', e.message);
+        }
+      }
+
+      res.json({
+        success: true,
+        skippedLockedFiles: skippedLockedFiles.length > 0
+          ? skippedLockedFiles
+          : undefined,
+      });
     } catch (error) {
+      // 出错时也要尝试恢复锁定文件的暂存状态
+      if (unstagedLockedFiles.length > 0) {
+        try {
+          await execGitCommand(
+            ['add', '--', ...unstagedLockedFiles], { log: false }
+          );
+        } catch (_) { /* 忽略恢复失败，不掩盖原始错误 */ }
+      }
+      if (tempFile) {
+        await fs.unlink(tempFile).catch(() => {});
+      }
       res.status(500).json({ success: false, error: error.message });
     }
   });