[WIP] Happy days git integration wp3 #12773
+713
−22
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package org.jabref.gui.importer.actions; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.Optional; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.logic.git.GitHandler; | ||
| import org.jabref.logic.importer.ParserResult; | ||
| import org.jabref.logic.preferences.CliPreferences; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * This action checks whether this BIB file is contained in a Git repository. If so, | ||
| * then the file is tagged as "versioned" in BibDatabaseContext and a git pull is | ||
| * attempted. | ||
| */ | ||
| public class CheckForVersionControlAction implements GUIPostOpenAction { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(CheckForVersionControlAction.class); | ||
| private GitHandler gitHandler; | ||
|
|
||
| @Override | ||
| public boolean isActionNecessary(ParserResult parserResult, DialogService dialogService, CliPreferences preferences) { | ||
| Optional<Path> path = parserResult.getDatabaseContext().getDatabasePath(); | ||
| if (path.isEmpty()) { | ||
| return false; | ||
| } | ||
| this.gitHandler = new GitHandler(path.get()); | ||
| return gitHandler.isGitRepository(); | ||
| } | ||
|
|
||
| @Override | ||
| public void performAction(ParserResult parserResult, DialogService dialogService, CliPreferences preferencesService) { | ||
| parserResult.getDatabaseContext().setVersioned(true); | ||
|
|
||
| try { | ||
| this.gitHandler.pullOnCurrentBranch(); | ||
| } catch (IOException e) { | ||
| LOGGER.error("Failed to pull.", e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package org.jabref.gui.shared; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.Optional; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.StateManager; | ||
| import org.jabref.gui.actions.SimpleCommand; | ||
| import org.jabref.gui.preferences.GuiPreferences; | ||
| import org.jabref.logic.git.GitHandler; | ||
| import org.jabref.model.database.BibDatabaseContext; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class GitPullAction extends SimpleCommand { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(GitPullAction.class); | ||
|
|
||
| private final GuiPreferences preferences; | ||
| private final DialogService dialogService; | ||
| private final StateManager stateManager; | ||
|
|
||
| public GitPullAction( | ||
| GuiPreferences preferences, | ||
| DialogService dialogService, | ||
| StateManager stateManager) { | ||
| this.preferences = preferences; | ||
| this.dialogService = dialogService; | ||
| this.stateManager = stateManager; | ||
| } | ||
|
|
||
| @Override | ||
| public void execute() { | ||
|
There was a problem hiding this comment. The method lacks JavaDoc despite being a public method that performs complex Git operations. Complex public methods should have comprehensive documentation. |
||
| BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get(); | ||
| if (stateManager.getActiveDatabase().isEmpty()) { | ||
| return; | ||
| } | ||
koppor marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Potential NPE as get() is called before isEmpty() check. The code retrieves the database before checking if it exists, violating the fail-fast principle and risking exceptions. |
||
|
|
||
| Optional<Path> path = databaseContext.getDatabasePath(); | ||
| if (path.isEmpty()) { | ||
| return; | ||
| } | ||
|
|
||
| GitHandler gitHandler = new GitHandler(path.get().getParent(), false); | ||
| if (gitHandler.isGitRepository()) { | ||
| try { | ||
| gitHandler.updateCredentials(preferences.getGitPreferences()); | ||
| gitHandler.pullOnCurrentBranch(); | ||
| } catch (IOException e) { | ||
| dialogService.showErrorDialogAndWait(e); | ||
| } | ||
| } else { | ||
| LOGGER.info("Not a git repository at path: {}", path.get()); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package org.jabref.gui.shared; | ||
|
|
||
| import java.io.IOException; | ||
| import java.nio.file.Path; | ||
| import java.util.Optional; | ||
|
|
||
| import org.jabref.gui.DialogService; | ||
| import org.jabref.gui.StateManager; | ||
| import org.jabref.gui.actions.SimpleCommand; | ||
| import org.jabref.gui.preferences.GuiPreferences; | ||
| import org.jabref.logic.git.GitHandler; | ||
| import org.jabref.model.database.BibDatabaseContext; | ||
|
|
||
| import org.eclipse.jgit.api.errors.GitAPIException; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class GitPushAction extends SimpleCommand { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(GitPushAction.class); | ||
|
|
||
| private final GuiPreferences preferences; | ||
| private final DialogService dialogService; | ||
| private final StateManager stateManager; | ||
|
|
||
| public GitPushAction( | ||
| GuiPreferences preferences, | ||
| DialogService dialogService, | ||
| StateManager stateManager) { | ||
| this.preferences = preferences; | ||
| this.dialogService = dialogService; | ||
| this.stateManager = stateManager; | ||
| } | ||
|
|
||
| @Override | ||
| public void execute() { | ||
| if (stateManager.getActiveDatabase().isEmpty()) { | ||
| return; | ||
| } | ||
| BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get(); | ||
|
|
||
| Optional<Path> path = databaseContext.getDatabasePath(); | ||
| if (path.isEmpty()) { | ||
| return; | ||
| } | ||
|
|
||
| GitHandler gitHandler = new GitHandler(path.get().getParent(), false); | ||
| if (gitHandler.isGitRepository()) { | ||
| try { | ||
| gitHandler.createCommitOnCurrentBranch("Automatic update via JabRef", false); | ||
| gitHandler.updateCredentials(preferences.getGitPreferences()); | ||
| gitHandler.pushCommitsToRemoteRepository(); | ||
| } catch (IOException | GitAPIException e) { | ||
| dialogService.showErrorDialogAndWait(e); | ||
| } | ||
| } else { | ||
| LOGGER.info("Not a git repository at path: {}", path.get()); | ||
|
There was a problem hiding this comment. The log message directly calls path.get() without checking if the value is present, which could lead to NoSuchElementException. The Optional should be handled properly. There was a problem hiding this comment. 
As per intelliJ's response when trying to set a condition, it can be said that there will always be a path and hence this comment is irrelevant? There was a problem hiding this comment. Just log path, will appear properly. Try it out! |
||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does an AI bot create these empty lines?
I would recommend to review a commit using git gui!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My accident actually! A member of my team had accidentally added a few dependencies and removed some when trying to add the git functionality to the main menu (He wanted to add an icon next to "Git"). I was removing these dependencies manually and left a line. Will fix that and review the changes properly next time, thank you.