zen-gitsync 2.0.1 → 2.0.4

package/src/ui/client/src/stores/gitLogStore.ts

@@ -0,0 +1,464 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useGitStore } from './gitStore'
+
+export const useGitLogStore = defineStore('gitLog', () => {
+  // 引用gitStore获取仓库状态
+  const gitStore = useGitStore()
+  
+  // 状态
+  const log = ref<any[]>([])
+  const status = ref<{ staged: string[], unstaged: string[], untracked: string[] }>({
+    staged: [],
+    unstaged: [],
+    untracked: []
+  })
+  const isLoadingLog = ref(false)
+  const isLoadingStatus = ref(false)
+  const isAddingFiles = ref(false)
+  const isResetting = ref(false)
+  
+  // 获取提交日志
+  async function fetchLog() {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      console.log('当前目录不是Git仓库，跳过加载提交历史')
+      return
+    }
+    
+    try {
+      isLoadingLog.value = true
+      console.log('开始加载提交历史...')
+      const response = await fetch('/api/log')
+      const data = await response.json()
+      if (data.log && Array.isArray(data.log)) {
+        log.value = data.log
+      }
+      console.log(`提交历史加载完成，共 ${log.value.length} 条记录`)
+    } catch (error) {
+      console.error('获取提交历史失败:', error)
+      ElMessage({
+        message: `获取提交历史失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+    } finally {
+      isLoadingLog.value = false
+    }
+  }
+  
+  // 获取Git状态
+  async function fetchStatus() {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      console.log('当前目录不是Git仓库，跳过加载Git状态')
+      return
+    }
+    
+    try {
+      isLoadingStatus.value = true
+      const response = await fetch('/api/status')
+      const data = await response.json()
+      if (data.status) {
+        status.value = {
+          staged: data.status.staged || [],
+          unstaged: data.status.unstaged || [],
+          untracked: data.status.untracked || []
+        }
+      }
+    } catch (error) {
+      console.error('获取Git状态失败:', error)
+      ElMessage({
+        message: `获取Git状态失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+    } finally {
+      isLoadingStatus.value = false
+    }
+  }
+  
+  // 添加文件到暂存区 (git add .)
+  async function addToStage() {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      ElMessage.warning('当前目录不是Git仓库')
+      return false
+    }
+    
+    try {
+      isAddingFiles.value = true
+      const response = await fetch('/api/add', {
+        method: 'POST'
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: '文件已添加到暂存区',
+          type: 'success'
+        })
+        
+        // 刷新状态
+        fetchStatus()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `添加文件失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `添加文件失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    } finally {
+      isAddingFiles.value = false
+    }
+  }
+  
+  // 提交更改
+  async function commitChanges(message: string, noVerify = false) {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      ElMessage.warning('当前目录不是Git仓库')
+      return false
+    }
+    
+    try {
+      const response = await fetch('/api/commit', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ 
+          message,
+          hasNewlines: message.includes('\n'),
+          noVerify
+        })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: '提交成功',
+          type: 'success'
+        })
+        
+        // 刷新状态和日志
+        fetchStatus()
+        fetchLog()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `提交失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `提交失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    }
+  }
+  
+  // 推送到远程
+  async function pushToRemote() {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      ElMessage.warning('当前目录不是Git仓库')
+      return false
+    }
+    
+    try {
+      const response = await fetch('/api/push', {
+        method: 'POST'
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: '推送成功',
+          type: 'success'
+        })
+        
+        // 刷新日志
+        fetchLog()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `推送失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `推送失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    }
+  }
+  
+  // 暂存并提交
+  async function addAndCommit(message: string, noVerify = false) {
+    try {
+      // 先添加到暂存区
+      const addResult = await addToStage()
+      if (!addResult) {
+        return false
+      }
+      
+      // 再提交
+      return await commitChanges(message, noVerify)
+    } catch (error) {
+      ElMessage({
+        message: `暂存并提交失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    }
+  }
+  
+  // 暂存、提交并推送
+  async function addCommitAndPush(message: string, noVerify = false) {
+    try {
+      // 先添加并提交
+      const commitResult = await addAndCommit(message, noVerify)
+      if (!commitResult) {
+        return false
+      }
+      
+      // 再推送
+      const pushResult = await pushToRemote()
+      
+      // 推送成功后，确保刷新日志
+      if (pushResult) {
+        // 添加延迟以确保服务器处理完成
+        setTimeout(() => {
+          console.log('刷新提交历史...')
+          fetchLog()
+        }, 300)
+      }
+      
+      return pushResult
+    } catch (error) {
+      ElMessage({
+        message: `暂存、提交并推送失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    }
+  }
+  
+  // 重置暂存区 (git reset HEAD)
+  async function resetHead() {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      ElMessage.warning('当前目录不是Git仓库')
+      return false
+    }
+    
+    try {
+      isResetting.value = true
+      const response = await fetch('/api/reset-head', {
+        method: 'POST'
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: '已重置暂存区',
+          type: 'success'
+        })
+        
+        // 刷新状态
+        fetchStatus()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `重置暂存区失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `重置暂存区失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    } finally {
+      isResetting.value = false
+    }
+  }
+  
+  // 重置当前分支到远程状态
+  async function resetToRemote(branch: string) {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      ElMessage.warning('当前目录不是Git仓库')
+      return false
+    }
+    
+    try {
+      isResetting.value = true
+      const response = await fetch('/api/reset-to-remote', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ branch })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: `已重置分支 ${branch} 到远程状态`,
+          type: 'success'
+        })
+        
+        // 刷新状态和日志
+        fetchStatus()
+        fetchLog()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `重置分支失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `重置分支失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    } finally {
+      isResetting.value = false
+    }
+  }
+  
+  // 暂存文件
+  async function stageFiles(files: string[]) {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      ElMessage.warning('当前目录不是Git仓库')
+      return false
+    }
+    
+    try {
+      const response = await fetch('/api/stage', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ files })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: '暂存文件成功',
+          type: 'success'
+        })
+        
+        // 刷新状态
+        fetchStatus()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `暂存文件失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `暂存文件失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    }
+  }
+  
+  // 取消暂存文件
+  async function unstageFiles(files: string[]) {
+    // 检查是否是Git仓库
+    if (!gitStore.isGitRepo) {
+      ElMessage.warning('当前目录不是Git仓库')
+      return false
+    }
+    
+    try {
+      const response = await fetch('/api/unstage', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ files })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: '取消暂存成功',
+          type: 'success'
+        })
+        
+        // 刷新状态
+        fetchStatus()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `取消暂存失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `取消暂存失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    }
+  }
+  
+  return {
+    // 状态
+    log,
+    status,
+    isLoadingLog,
+    isLoadingStatus,
+    isAddingFiles,
+    isResetting,
+    
+    // 方法
+    fetchLog,
+    fetchStatus,
+    addToStage,
+    commitChanges,
+    pushToRemote,
+    addAndCommit,
+    addCommitAndPush,
+    resetHead,
+    resetToRemote,
+    stageFiles,
+    unstageFiles
+  }
+}) 

package/src/ui/client/src/stores/gitStore.ts

@@ -0,0 +1,216 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import { ElMessage } from 'element-plus'
+
+export const useGitStore = defineStore('git', () => {
+  // 状态
+  const currentBranch = ref('')
+  const allBranches = ref<string[]>([])
+  const userName = ref('')
+  const userEmail = ref('')
+  const isChangingBranch = ref(false)
+  const isCreatingBranch = ref(false)
+  const isGitRepo = ref(false) // 当前目录是否是Git仓库
+  const lastCheckedTime = ref(0) // 上次检查Git仓库状态的时间戳
+  
+  // 检查当前目录是否是Git仓库
+  async function checkGitRepo() {
+    // 如果距离上次检查不到1秒，直接返回缓存的结果
+    const now = Date.now()
+    if (now - lastCheckedTime.value < 1000) {
+      console.log('使用缓存的Git仓库状态:', isGitRepo.value ? '是' : '不是')
+      return isGitRepo.value
+    }
+    
+    try {
+      const response = await fetch('/api/current_directory')
+      const data = await response.json()
+      isGitRepo.value = data.isGitRepo === true
+      lastCheckedTime.value = now // 更新检查时间
+      console.log(`当前目录${isGitRepo.value ? '是' : '不是'}Git仓库`)
+      return isGitRepo.value
+    } catch (error) {
+      console.error('检查Git仓库状态失败:', error)
+      isGitRepo.value = false
+      lastCheckedTime.value = now // 即使失败也更新检查时间，避免频繁重试
+      return false
+    }
+  }
+
+  // 获取当前分支
+  async function getCurrentBranch() {
+    try {
+      const response = await fetch('/api/branch')
+      const data = await response.json()
+      if (data.branch) {
+        currentBranch.value = data.branch
+      }
+    } catch (error) {
+      console.error('获取分支信息失败:', error)
+    }
+  }
+
+  // 获取所有分支
+  async function getAllBranches() {
+    try {
+      const response = await fetch('/api/branches')
+      const data = await response.json()
+      if (data.branches && Array.isArray(data.branches)) {
+        allBranches.value = data.branches
+      }
+    } catch (error) {
+      console.error('获取所有分支信息失败:', error)
+    }
+  }
+
+  // 切换分支
+  async function changeBranch(branch: string) {
+    console.log('切换到分支:', branch)
+    
+    try {
+      isChangingBranch.value = true
+      const response = await fetch('/api/checkout', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({ branch })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: `已切换到分支: ${branch}`,
+          type: 'success'
+        })
+        
+        // 刷新状态
+        getCurrentBranch()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `切换分支失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `切换分支失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    } finally {
+      isChangingBranch.value = false
+    }
+  }
+
+  // 获取Git用户信息
+  async function getUserInfo() {
+    try {
+      const response = await fetch('/api/user-info')
+      const data = await response.json()
+      if (data.name && data.email) {
+        userName.value = data.name
+        userEmail.value = data.email
+      }
+    } catch (error) {
+      console.error('获取用户信息失败:', error)
+    }
+  }
+
+  // 创建新分支
+  async function createBranch(newBranchName: string, baseBranch: string) {
+    if (!newBranchName.trim()) {
+      ElMessage({
+        message: '分支名称不能为空',
+        type: 'warning'
+      })
+      return false
+    }
+    
+    try {
+      isCreatingBranch.value = true
+      
+      const response = await fetch('/api/create-branch', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          newBranchName,
+          baseBranch: baseBranch || currentBranch.value
+        })
+      })
+      
+      const result = await response.json()
+      if (result.success) {
+        ElMessage({
+          message: `已创建并切换到分支: ${newBranchName}`,
+          type: 'success'
+        })
+        
+        // 刷新状态
+        getCurrentBranch()
+        getAllBranches()
+        
+        return true
+      } else {
+        ElMessage({
+          message: `创建分支失败: ${result.error}`,
+          type: 'error'
+        })
+        return false
+      }
+    } catch (error) {
+      ElMessage({
+        message: `创建分支失败: ${(error as Error).message}`,
+        type: 'error'
+      })
+      return false
+    } finally {
+      isCreatingBranch.value = false
+    }
+  }
+
+  // 初始化加载
+  async function loadInitialData() {
+    // 先检查当前目录是否是Git仓库
+    const isRepo = await checkGitRepo()
+    
+    // 只有是Git仓库的情况下才加载Git相关信息
+    if (isRepo) {
+      getCurrentBranch()
+      getAllBranches()
+      getUserInfo()
+    } else {
+      // 清空所有Git相关状态
+      currentBranch.value = ''
+      allBranches.value = []
+      userName.value = ''
+      userEmail.value = ''
+    }
+  }
+
+  return {
+    // 状态
+    currentBranch,
+    allBranches,
+    userName,
+    userEmail,
+    isChangingBranch,
+    isCreatingBranch,
+    isGitRepo,
+    lastCheckedTime,
+    
+    // 方法
+    checkGitRepo,
+    getCurrentBranch,
+    getAllBranches,
+    changeBranch,
+    getUserInfo,
+    createBranch,
+    loadInitialData
+  }
+})