chore(git): WIP: Add push test #12350

Author: wanling0000

docs/code-howtos/git.md

@@ -1,6 +1,7 @@
 # git
 
 ## Conflict Scenarios
+
 - **T1.** Remote changed a field, local did not  
   → No conflict.  
   The local version remained unchanged, so the remote change can be safely applied.
@@ -68,4 +69,3 @@
 - **T17.** Both added the same entry key with identical values  
   → No conflict.  
   Both sides created a new entry with the same citation key and identical fields, so it can be merged safely.
-

jablib/src/main/java/org/jabref/logic/git/GitSyncService.java

@@ -123,12 +123,38 @@ public MergeResult performSemanticMerge(Git git,
     }
 
     // WIP
-    // TODO: add test
-    public void push(Path bibFilePath) throws GitAPIException, IOException {
-        // 1. Auto-commit: commit if there are changes
+    public void push(Path bibFilePath) throws GitAPIException, IOException, JabRefException{
+        // 1. 1: Fetch remote changes
+        gitHandler.fetchOnCurrentBranch();
+
+        // 2: Check if local branch is behind remote
+        if (gitHandler.isBehindRemote()) {
+            LOGGER.info("Remote changes detected — performing semantic merge");
+
+            // 2.1: Resolve commit identifiers
+            RevCommit baseCommit = gitHandler.findMergeBaseWithRemote();
+            RevCommit localCommit = gitHandler.resolveHead();
+            RevCommit remoteCommit = gitHandler.resolveRemoteHead();
+
+            // 2.2: Perform semantic merge of the .bib file
+            MergeResult mergeResult = performSemanticMerge(
+                    gitHandler.getGit(),
+                    baseCommit,
+                    localCommit,
+                    remoteCommit,
+                    bibFilePath
+            );
+
+            if (!mergeResult.isSuccessful()) {
+                LOGGER.warn("Semantic merge failed — aborting push");
+                return;
+            }
+        }
+
+        // 3: Commit changes if there are any
         boolean committed = gitHandler.createCommitOnCurrentBranch("Changes committed by JabRef", !AMEND);
 
-        // 2. push to remote
+        // 4: Push to remote only if a commit was made
         if (committed) {
             gitHandler.pushCommitsToRemoteRepository();
         } else {

jablib/src/test/java/org/jabref/logic/git/GitSyncServiceTest.java

@@ -149,6 +149,29 @@ void pullTriggersSemanticMergeWhenNoConflicts() throws Exception {
         assertEquals(normalize(expected), normalize(merged));
     }
 
+    @Test
+    void pushTriggersMergeAndPushWhenNoConflicts() throws Exception {
+        GitHandler gitHandler = mock(GitHandler.class);
+        GitSyncService syncService = new GitSyncService(importFormatPreferences, gitHandler);
+        syncService.push(library);
+
+        String pushedContent = GitFileReader.readFileFromCommit(git, git.log().setMaxCount(1).call().iterator().next(), Path.of("library.bib"));
+        String expected = """
+        @article{a,
+          author = {author-a},
+          doi = {xya},
+        }
+
+        @article{b,
+          author = {author-b},
+          doi = {xyz},
+        }
+        """;
+
+        assertEquals(normalize(expected), normalize(pushedContent));
+    }
+
+
     @Test
     void readFromCommits() throws Exception {
         String base = GitFileReader.readFileFromCommit(git, baseCommit, Path.of("library.bib"));