Skip to content

Adding "Reset to here" action in patch set context menu#416

Open
brownian-motion wants to merge 4 commits intouwolfer:intellij14from
brownian-motion:addingReset
Open

Adding "Reset to here" action in patch set context menu#416
brownian-motion wants to merge 4 commits intouwolfer:intellij14from
brownian-motion:addingReset

Conversation

@brownian-motion
Copy link
Copy Markdown

No description provided.

Copy link
Copy Markdown
Owner

@uwolfer uwolfer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for working on this! I've added some minor comment. Will test it once these fixed have been cleaned up.

Comment thread src/main/java/com/urswolfer/intellij/plugin/gerrit/git/GerritGitUtil.java Outdated
Comment thread src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/action/ResetAction.java Outdated
Comment thread src/main/java/com/urswolfer/intellij/plugin/gerrit/ui/action/ResetAction.java Outdated
Comment thread src/main/resources/META-INF/plugin.xml Outdated
@uwolfer
Copy link
Copy Markdown
Owner

uwolfer commented Aug 3, 2021

@brownian-motion: Do you think you will find the time to implement my comments?

@brownian-motion
Copy link
Copy Markdown
Author

Hello, and thanks for looking at this PR so closely! I apologize for taking so long to reply @uwolfer . I'd be happy to implement these changes, and will submit a new commit soon!

}

public Optional<VcsFullCommitDetails> loadGitCommitInfo(Project project, GitRepository gitRepository, ChangeInfo changeInfo) throws VcsException {
List<GitCommit> history = GitHistoryUtils.history(project, gitRepository.getRoot(), changeInfo.id);
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changeInfo.id does not work in my case, it is not a git commit hash.

You can take a look at gerritUtil.getFirstFetchInfo(changeDetails);


public Optional<VcsFullCommitDetails> loadGitCommitInfo(Project project, GitRepository gitRepository, ChangeInfo changeInfo) throws VcsException {
List<GitCommit> history = GitHistoryUtils.history(project, gitRepository.getRoot(), changeInfo.id);
if (history.isEmpty()){
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a space before { (here and in other new code places).

@uwolfer
Copy link
Copy Markdown
Owner

uwolfer commented Jul 27, 2022

@brownian-motion: Do you plan to update this PR?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants