MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[log] IDEA-116399 Fix filter by branch

Browse Source 
--branches parameter doesn't work well: the pattern syntax it
supports is rather weak, and won't allow to effectively filter by
several branches. It also doesn't support filtering by a single
branch without blog parameters.

Therefore, since we allow to filter only by a single branch in the
log UI, assume it in the GitLogProvider, and use the <branch>
parameter (`git log origin/master`), which works fine.

If we will provide ability to filter by several branches someday (by
AND or by OR), we could use the graph capabilities to implement it.
This commit is contained in:
Kirill Likhodedov
2013-11-25 19:16:12 +04:00
parent 4696e18f58
commit 7e8b160547
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/log/GitLogProvider.java
+7 -7
View File
@@ -179,13 +179,13 @@ public class GitLogProvider implements VcsLogProvider {
List<VcsLogBranchFilter> branchFilters = ContainerUtil.findAll(filters, VcsLogBranchFilter.class);
if (!branchFilters.isEmpty()) {
String branchFilter = joinFilters(branchFilters, new Function<VcsLogBranchFilter, String>() {
@Override
public String fun(VcsLogBranchFilter filter) {
return filter.getBranchName();
}
});
filterParameters.add(prepareParameter("branches", branchFilter));
// git doesn't support filtering by several branches very well (--branches parameter give a weak pattern capabilities)
// => by now assuming there is only one branch filter.
if (branchFilters.size() > 1) {
LOG.warn("More than one branch filter was passed. Using only the first one.");
}
VcsLogBranchFilter branchFilter = branchFilters.get(0);
filterParameters.add(branchFilter.getBranchName());
}
else {
filterParameters.add("--all");