sayurinana/agent-aide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[aide] 修复: _cleanup_lock_file 移到切换分支后执行，确保目标分支上的 lock 文件也被删除

Browse Source
This commit is contained in:
sayurinana(vm)
2025-12-17 06:34:04 +08:00
parent fceb067984
commit cfc7a1284a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.aide/flow-status.lock
View File

@@ -1 +0,0 @@
46068

12
aide-program/aide/flow/branch.py
View File

@@ -323,12 +323,12 @@ class BranchManager:
source_branch = branch_info.source_branch source_branch = branch_info.source_branch
task_branch = branch_info.branch_name task_branch = branch_info.branch_name
# 切换分支前清理 lock 文件，避免冲突
self._cleanup_lock_file()
# 切回源分支 # 切回源分支
self.git.checkout(source_branch) self.git.checkout(source_branch)
# 切换分支后清理 lock 文件（确保 master 上的 lock 文件也被删除）
self._cleanup_lock_file()
# squash 合并任务分支 # squash 合并任务分支
self.git.merge_squash(task_branch) self.git.merge_squash(task_branch)
@@ -359,12 +359,12 @@ class BranchManager:
task_branch = branch_info.branch_name task_branch = branch_info.branch_name
temp_branch = f"{task_branch}-merge" temp_branch = f"{task_branch}-merge"
# 切换分支前清理 lock 文件，避免冲突
self._cleanup_lock_file()
# 从起始提交检出临时分支 # 从起始提交检出临时分支
self.git.checkout_new_branch(temp_branch, start_commit) self.git.checkout_new_branch(temp_branch, start_commit)
# 切换分支后清理 lock 文件
self._cleanup_lock_file()
# 在临时分支执行 squash 合并 # 在临时分支执行 squash 合并
self.git.merge_squash(task_branch) self.git.merge_squash(task_branch)