Skip to content

The Unified and Autonomous Development Platform

Fix issue #1019 - Allow ignoring importing forked repos from Github

Robin Shenca8f04c06576
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
index 44b5fed8ea..cf02c3f3eb 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
@@ -61,7 +61,8 @@ public class GitHubProjectImporter implements ProjectImporter {
protected ImportRepositories newSetting() {
ImportRepositories repositories = new ImportRepositories();
String organization = organizationStep.getSetting().getOrganization();
- for (String repository: serverStep.getSetting().listRepositories(organization)) {
+ for (String repository: serverStep.getSetting().listRepositories(
+ organization, organizationStep.getSetting().isIncludeForks())) {
ProjectMapping projectMapping = new ProjectMapping();
projectMapping.setGitHubRepo(repository);
projectMapping.setOneDevProject(repository);
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportOrganization.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportOrganization.java
index 70b4d179e2..ec2bb07c66 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportOrganization.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportOrganization.java
@@ -16,6 +16,8 @@ public class ImportOrganization implements Serializable {
ImportServer server;
private String organization;
+
+ private boolean includeForks;
@Editable(order=100, name="GitHub Organization", description="Select organization to import from. "
+ "Leave empty to import from repositories under current account")
@@ -28,6 +30,15 @@ public class ImportOrganization implements Serializable {
this.organization = organization;
}
+ @Editable(order=200, description="Whether or not to include forked repositories")
+ public boolean isIncludeForks() {
+ return includeForks;
+ }
+
+ public void setIncludeForks(boolean includeForks) {
+ this.includeForks = includeForks;
+ }
+
@SuppressWarnings("unused")
private static List<String> getOrganizationChoices() {
BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java
index bd869b987c..514444c3dc 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportRepository.java
@@ -33,7 +33,7 @@ public class ImportRepository extends ImportOrganization {
BeanEditor editor = ComponentContext.get().getComponent().findParent(BeanEditor.class);
ImportRepository setting = (ImportRepository) editor.getModelObject();
String organization = (String) EditContext.get().getInputValue("organization");
- return setting.server.listRepositories(organization);
+ return setting.server.listRepositories(organization, true);
}
}
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
index 5ca0935f8f..104a530d3c 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
@@ -139,7 +139,7 @@ public class ImportServer implements Serializable, Validatable {
return organizations;
}
- List<String> listRepositories(@Nullable String organization) {
+ List<String> listRepositories(@Nullable String organization, boolean includeForks) {
Client client = newClient();
try {
String apiEndpoint;
@@ -158,7 +158,8 @@ public class ImportServer implements Serializable, Validatable {
})) {
String repoName = repoNode.get("name").asText();
String ownerName = repoNode.get("owner").get("login").asText();
- repositories.add(ownerName + "/" + repoName);
+ if (includeForks || !repoNode.get("fork").asBoolean())
+ repositories.add(ownerName + "/" + repoName);
}
Collections.sort(repositories);
return repositories;