Bonsai, bump ifcmerge.exe to working version with deps

brunopostle · brunopostle · commit 27d9cae8ff53 · 2026-04-07T22:25:31.000+01:00
Don't leave a broken repo if ifcmerge is misinstalled.
Fix bug where only local branches could be merged.
Fix gitch where merge commits were not considered relevant.
diff --git a/src/bonsai/Makefile b/src/bonsai/Makefile
@@ -64,7 +64,7 @@ PYNUMBER:=3$(PYMINOR)
 PYPI_VERSION:=3.$(PYMINOR)
 endif # def PYVERSION
 
-IFCMERGE_VERSION:=2026-04-02
+IFCMERGE_VERSION:=2026-04-07
 
 ifdef PLATFORM
 SUPPORTED_PLATFORMS := linux macos macosm1 win
diff --git a/src/bonsai/bonsai/core/ifcgit.py b/src/bonsai/bonsai/core/ifcgit.py
@@ -151,8 +151,11 @@ def merge_branch(ifcgit: type[tool.IfcGit], ifc: type[tool.Ifc], operator: bpy.t
         conflicts = ifcgit.git_mergetool(mergetool, path_ifc)
         if conflicts is not None:
             ifcgit.git_merge_abort()
-            ifcgit.store_merge_conflicts(conflicts)
-            operator.report({"WARNING"}, "Merge failed — see the conflict report in the panel below")
+            if conflicts:
+                ifcgit.store_merge_conflicts(conflicts)
+                operator.report({"WARNING"}, "Merge failed — see the conflict report in the panel below")
+            else:
+                operator.report({"ERROR"}, "Merge tool failed — check that ifcmerge is installed correctly")
             return False
         ifcgit.commit_merge(path_ifc)
 
diff --git a/src/bonsai/bonsai/tool/ifcgit.py b/src/bonsai/bonsai/tool/ifcgit.py
@@ -217,19 +217,25 @@ def get_commits_list(cls, path_ifc: str, lookup: dict[str, Any]) -> None:
                 rev=[props.display_branch],
             )
         )
-        commits_relevant = list(
+        commits_relevant = set(
             git.objects.commit.Commit.iter_items(
                 repo=repo,
                 rev=[props.display_branch],
                 paths=[path_ifc],
             )
         )
 
+        def is_relevant(commit):
+            if commit in commits_relevant:
+                return True
+            # Merge commits are relevant too
+            return len(commit.parents) > 1 and any(p in commits_relevant for p in commit.parents)
+
         for commit in commits:
 
             if props.ifcgit_filter == "tagged" and commit.hexsha not in lookup:
                 continue
-            elif props.ifcgit_filter == "relevant" and commit not in commits_relevant:
+            elif props.ifcgit_filter == "relevant" and not is_relevant(commit):
                 continue
 
             props.ifcgit_commits.add()
@@ -239,7 +245,7 @@ def get_commits_list(cls, path_ifc: str, lookup: dict[str, Any]) -> None:
             list_item.author_name = commit.author.name
             list_item.author_email = commit.author.email
             list_item.committed_date = int(commit.committed_date)
-            if commit in commits_relevant:
+            if is_relevant(commit):
                 list_item.relevant = True
             if commit.hexsha in lookup:
                 for tag in lookup[commit.hexsha]:
@@ -589,7 +595,7 @@ def git_merge(cls, branch_name: str) -> Union[str, None]:
         """Attempt a git merge. Returns None on clean merge, 'conflict' on expected
         GitCommandError, or 'error' on an unknown GitError."""
         repo = IfcGitRepo.repo
-        branch = repo.branches[branch_name]
+        branch = repo.refs[branch_name]
         try:
             repo.git.merge(branch)
             return None
@@ -603,7 +609,7 @@ def git_merge_no_commit(cls, branch_name: str) -> Union[str, None]:
         """Attempt a git merge without committing (always leaves a merge state to abort).
         Returns None on clean merge, 'conflict' on conflict, or 'error' on unknown failure."""
         repo = IfcGitRepo.repo
-        branch = repo.branches[branch_name]
+        branch = repo.refs[branch_name]
         try:
             repo.git.merge(branch, no_commit=True, no_ff=True)
             return None
@@ -619,8 +625,8 @@ def git_mergetool(cls, mergetool: str, path_ifc: str) -> Union[list, None]:
         report_path = path_ifc + ".ifcmerge"
         try:
             repo.git.mergetool(tool=mergetool)
-        except git.exc.GitCommandError:
-            pass
+        except git.exc.GitCommandError as e:
+            print(f"ifcgit: mergetool failed: {e}")
 
         conflicts = None
         if os.path.exists(report_path):
@@ -636,6 +642,10 @@ def git_mergetool(cls, mergetool: str, path_ifc: str) -> Union[list, None]:
                 os.remove(report_path)
             except OSError:
                 pass
+
+        if conflicts is None and repo.index.unmerged_blobs():
+            conflicts = []
+
         return conflicts
 
     @classmethod
