Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git show history should show results without having to press search #3294

Merged
merged 2 commits into from
Nov 8, 2021
Merged

git show history should show results without having to press search #3294

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
831507f
git show history action should display results for folders automatically
mbien Nov 2, 2021
5524e01
lambda renovation.
mbien Nov 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 31 additions & 40 deletions ide/git/src/org/netbeans/modules/git/ui/history/SearchHistoryAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,63 +63,54 @@ public static void openSearch(final File repository, final File[] roots, final S
}

public static void openSearch (final File repository, final File[] roots, final String branchName, final String contextName) {
openSearch(repository, roots, branchName, contextName, roots != null && (roots.length == 1 && roots[0].isFile() || roots.length > 1 && Utils.shareCommonDataObject(roots)));
openSearch(repository, roots, branchName, contextName, roots != null && (roots.length == 1 || roots.length > 1 && Utils.shareCommonDataObject(roots)));
}

public static void openSearch (final File repository, final File[] roots, final String branchName, final String contextName, final boolean invokeSearch) {
final String title = NbBundle.getMessage(SearchHistoryTopComponent.class, "LBL_SearchHistoryTopComponent.title", contextName);
final RepositoryInfo info = RepositoryInfo.getInstance(repository);
EventQueue.invokeLater(new Runnable() {
@Override
public void run () {
SearchHistoryTopComponent tc = new SearchHistoryTopComponent(repository, info, roots);
tc.setBranch(branchName);
tc.setDisplayName(title);
tc.open();
tc.requestActive();
if (invokeSearch) {
tc.search(false);
}
EventQueue.invokeLater(() -> {
SearchHistoryTopComponent tc = new SearchHistoryTopComponent(repository, info, roots);
tc.setBranch(branchName);
tc.setDisplayName(title);
tc.open();
tc.requestActive();
if (invokeSearch) {
tc.search(false);
}
});
}

public static void openSearch (final File repository, final File root, final String contextName,
final String commitIdFrom, final String commitIdTo) {
public static void openSearch (final File repository, final File root, final String contextName, final String commitIdFrom, final String commitIdTo) {
final String title = NbBundle.getMessage(SearchHistoryTopComponent.class, "LBL_SearchHistoryTopComponent.title", contextName);
final RepositoryInfo info = RepositoryInfo.getInstance(repository);
Mutex.EVENT.readAccess(new Runnable() {
@Override
public void run () {
SearchHistoryTopComponent tc = new SearchHistoryTopComponent(repository, info, new File[] { root });
tc.setDisplayName(title);
tc.open();
tc.requestActive();
tc.setSearchCommitFrom(commitIdFrom);
tc.setSearchCommitTo(commitIdTo);
tc.search(true);
}
Mutex.EVENT.readAccess(() -> {
SearchHistoryTopComponent tc = new SearchHistoryTopComponent(repository, info, new File[] { root });
tc.setDisplayName(title);
tc.open();
tc.requestActive();
tc.setSearchCommitFrom(commitIdFrom);
tc.setSearchCommitTo(commitIdTo);
tc.search(true);
});
}

public static void openSearch (final File repository, final File root, final String contextName, final int lineNumber) {
final String title = NbBundle.getMessage(SearchHistoryTopComponent.class, "LBL_SearchHistoryTopComponent.title", contextName);
final RepositoryInfo info = RepositoryInfo.getInstance(repository);
EventQueue.invokeLater(new Runnable() {
@Override
public void run () {
SearchHistoryTopComponent tc = new SearchHistoryTopComponent(repository, info, root, new SearchHistoryTopComponent.DiffResultsViewFactory() {
@Override
DiffResultsView createDiffResultsView(SearchHistoryPanel panel, List<RepositoryRevision> results) {
return new DiffResultsViewForLine(panel, results, lineNumber);
}
});
tc.setDisplayName(title);
tc.open();
tc.requestActive();
tc.search(true);
tc.activateDiffView(true);
}
EventQueue.invokeLater(() -> {
SearchHistoryTopComponent tc = new SearchHistoryTopComponent(repository, info, root,
new SearchHistoryTopComponent.DiffResultsViewFactory() {
@Override
DiffResultsView createDiffResultsView(SearchHistoryPanel panel, List<RepositoryRevision> results) {
return new DiffResultsViewForLine(panel, results, lineNumber);
}
});
tc.setDisplayName(title);
tc.open();
tc.requestActive();
tc.search(true);
tc.activateDiffView(true);
});
}

Expand Down