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

Github: show branches from source repository

Browse Source
This commit is contained in:
Aleksey Pivovarov
2013-08-01 11:18:34 +04:00
parent cad83a246f
commit 20471b30da
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/github/src/org/jetbrains/plugins/github/GithubCreatePullRequestAction.java
View File

@@ -275,6 +275,7 @@ public class GithubCreatePullRequestAction extends DumbAwareAction {
final GithubAuthData auth = info.getAuthData();
final GithubRepoDetailed repo = info.getRepo();
final GithubRepo parent = repo.getParent();
final GithubRepo source = repo.getSource();
result.addAll(getBranches(auth, repo.getUserName(), repo.getName()));
@@ -282,9 +283,11 @@ public class GithubCreatePullRequestAction extends DumbAwareAction {
result.addAll(getBranches(auth, parent.getUserName(), parent.getName()));
}
if (upstreamPath != null &&
!StringUtil.equalsIgnoreCase(upstreamPath.getUser(), repo.getUserName()) &&
(parent == null || !StringUtil.equalsIgnoreCase(upstreamPath.getUser(), parent.getUserName()))) {
if (source != null && !equals(source, parent)) {
result.addAll(getBranches(auth, source.getUserName(), source.getName()));
}
if (upstreamPath != null && !equals(upstreamPath, repo) && !equals(upstreamPath, parent) && !equals(upstreamPath, source)) {
result.addAll(getBranches(auth, upstreamPath.getUser(), upstreamPath.getRepository()));
}
}
@@ -314,6 +317,20 @@ public class GithubCreatePullRequestAction extends DumbAwareAction {
}
});
}
private boolean equals(@NotNull GithubRepo repo1, @Nullable GithubRepo repo2) {
if (repo2 == null) {
return false;
}
return StringUtil.equalsIgnoreCase(repo1.getUserName(), repo2.getUserName());
}
private boolean equals(@NotNull GithubFullPath repo1, @Nullable GithubRepo repo2) {
if (repo2 == null) {
return false;
}
return StringUtil.equalsIgnoreCase(repo1.getUser(), repo2.getUserName());
}
}.execute();
}