Skip to content

The Unified and Autonomous Development Platform

midwor

Robin Shen697908ab1f92
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 1661a6c166..82a118adaa 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -509,71 +509,73 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Transactional
@Override
- public void fork(Project from, Project to) {
- Project parent = to.getParent();
- if (parent != null && parent.isNew())
- create(parent);
-
- ProjectUpdate update = new ProjectUpdate();
- update.setProject(to);
- updateManager.save(update);
- to.setUpdate(update);
-
- dao.persist(to);
- FileUtils.createDir(storageManager.getProjectDir(to.getId()));
-
- UserAuthorization authorization = new UserAuthorization();
- authorization.setProject(to);
- authorization.setUser(SecurityUtils.getUser());
- authorization.setRole(roleManager.getOwner());
- userAuthorizationManager.save(authorization);
+ public void fork(Project from, Project to) {
+ Long fromId = from.getId();
+ String fromPath = from.getPath();
+ Long toId = to.getId();
- File toGitDir = storageManager.getProjectGitDir(to.getId());
- FileUtils.cleanDir(toGitDir);
-
- UUID fromStorageServerUUID = getStorageServerUUID(from.getId(), true);
- if (fromStorageServerUUID.equals(clusterManager.getLocalServerUUID())) {
- File fromGitDir = storageManager.getProjectGitDir(from.getId());
- new CloneCommand(toGitDir, fromGitDir.getAbsolutePath()).noLfs(true).mirror(true).run();
- storageManager.initLfsDir(to.getId());
- new LfsFetchAllCommand(toGitDir).run();
- } else {
- CommandUtils.callWithClusterCredential(new GitTask<Void>() {
+ runOnProjectServer(toId, new ClusterTask<Void>() {
- @Override
- public Void call(Commandline git) {
- String remoteUrl = clusterManager.getServerUrl(fromStorageServerUUID) + "/" + from.getPath();
- new CloneCommand(toGitDir, remoteUrl) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ File toGitDir = storageManager.getProjectGitDir(toId);
+ FileUtils.cleanDir(toGitDir);
+
+ UUID fromStorageServerUUID = getStorageServerUUID(fromId, true);
+ if (fromStorageServerUUID.equals(clusterManager.getLocalServerUUID())) {
+ File fromGitDir = storageManager.getProjectGitDir(fromId);
+ new CloneCommand(toGitDir, fromGitDir.getAbsolutePath()).noLfs(true).mirror(true).run();
+ storageManager.initLfsDir(toId);
+ new LfsFetchAllCommand(toGitDir).run();
+ } else {
+ CommandUtils.callWithClusterCredential(new GitTask<Void>() {
@Override
- protected Commandline newGit() {
- return git;
+ public Void call(Commandline git) {
+ String remoteUrl = clusterManager.getServerUrl(fromStorageServerUUID) + "/" + fromPath;
+ new CloneCommand(toGitDir, remoteUrl) {
+
+ @Override
+ protected Commandline newGit() {
+ return git;
+ }
+
+ }.noLfs(true).mirror(true).run();
+ return null;
}
-
- }.noLfs(true).mirror(true).run();
+
+ });
+
+ storageManager.initLfsDir(toId);
- storageManager.initLfsDir(to.getId());
- new LfsFetchAllCommand(toGitDir) {
-
+ CommandUtils.callWithClusterCredential(new GitTask<Void>() {
+
@Override
- protected Commandline newGit() {
- return git;
+ public Void call(Commandline git) {
+ new LfsFetchAllCommand(toGitDir) {
+
+ @Override
+ protected Commandline newGit() {
+ return git;
+ }
+
+ }.run();
+ return null;
}
-
- }.run();
- return null;
- }
-
- });
- }
-
- checkGitHooksAndConfig(to.getId());
- commitInfoManager.cloneInfo(from.getId(), to.getId());
- avatarManager.copyProjectAvatar(from.getId(), to.getId());
-
- updateStorageServer(to);
-
- listenerRegistry.post(new ProjectCreated(to));
+
+ });
+
+ }
+
+ checkGitHooksAndConfig(toId);
+ commitInfoManager.cloneInfo(fromId, toId);
+ avatarManager.copyProjectAvatar(fromId, toId);
+ return null;
+ }
+
+ });
}
private void updateStorageServer(Project project) {
@@ -585,40 +587,23 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Transactional
@Override
public void clone(Project project, String repositoryUrl) {
- Project parent = project.getParent();
- if (parent != null && parent.isNew())
- create(parent);
-
- ProjectUpdate update = new ProjectUpdate();
- update.setProject(project);
- updateManager.save(update);
- project.setUpdate(update);
-
- dao.persist(project);
- FileUtils.createDir(storageManager.getProjectDir(project.getId()));
-
- User user = SecurityUtils.getUser();
- UserAuthorization authorization = new UserAuthorization();
- authorization.setProject(project);
- authorization.setUser(user);
- authorization.setRole(roleManager.getOwner());
- project.getUserAuthorizations().add(authorization);
- user.getProjectAuthorizations().add(authorization);
- userAuthorizationManager.save(authorization);
-
- File gitDir = storageManager.getProjectGitDir(project.getId());
- FileUtils.cleanDir(gitDir);
-
- new CloneCommand(gitDir, repositoryUrl).mirror(true).noLfs(true).run();
- storageManager.initLfsDir(project.getId());
- new LfsFetchAllCommand(gitDir).run();
+ Long projectId = project.getId();
+ runOnProjectServer(projectId, new ClusterTask<Void>() {
- checkGitHooksAndConfig(project.getId());
-
- updateStorageServer(project);
-
- listenerRegistry.post(new ProjectCreated(project));
-
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Void call() throws Exception {
+ File gitDir = storageManager.getProjectGitDir(projectId);
+ FileUtils.cleanDir(gitDir);
+ new CloneCommand(gitDir, repositoryUrl).mirror(true).noLfs(true).run();
+ storageManager.initLfsDir(projectId);
+ new LfsFetchAllCommand(gitDir).run();
+ return null;
+ }
+
+ });
+
List<ImmutableTriple<String, ObjectId, ObjectId>> refUpdatedEventData = new ArrayList<>();
for (RefFacade ref: project.getBranchRefs()) {
@@ -630,8 +615,6 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
ObjectId.zeroId(), ref.getPeeledObj().getId().copy()));
}
- Long projectId = project.getId();
-
sessionManager.runAsyncAfterCommit(new Runnable() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java
index aeb67648ba..8c05716cee 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/forkoption/ForkOptionPanel.java
@@ -110,6 +110,7 @@ public abstract class ForkOptionPanel extends Panel {
@Override
public void run() {
+ getProjectManager().create(newProject);
getProjectManager().fork(getProject(), newProject);
OneDev.getInstance(ProjectLabelManager.class).sync(newProject, labelsBean.getLabels());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
index ec4eed83ee..8521644efb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
@@ -16,7 +16,6 @@ import com.google.common.collect.Lists;
import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.imports.IssueImporter;
import io.onedev.server.imports.IssueImporterContribution;
import io.onedev.server.model.Issue;
@@ -89,7 +88,7 @@ public class IssueImportPage<Where extends Serializable, What extends Serializab
@Override
public String call() throws Exception {
- return doImport(false, logger);
+ return importer.doImport(getProject(), true, false, logger);
}
});
@@ -116,7 +115,7 @@ public class IssueImportPage<Where extends Serializable, What extends Serializab
@Override
public String call() throws Exception {
- return doImport(true, logger);
+ return importer.doImport(getProject(), true, true, logger);
}
});
@@ -142,19 +141,6 @@ public class IssueImportPage<Where extends Serializable, What extends Serializab
}
- private String doImport(boolean dryRun, TaskLogger logger) {
- IssueManager issueManager = OneDev.getInstance(IssueManager.class);
- Project numberScope = getProject().getForkRoot();
- try {
- issueManager.resetNextNumber(numberScope);
- Long nextNumber = issueManager.getNextNumber(numberScope);
- issueManager.resetNextNumber(numberScope);
- return importer.doImport(getProject(), nextNumber==1L, dryRun, logger);
- } finally {
- issueManager.resetNextNumber(numberScope);
- }
- }
-
@Override
protected boolean isPermitted() {
return SecurityUtils.getUser() != null;
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java
index 056036fe03..9770065321 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java
@@ -80,7 +80,7 @@ public class GitHubIssueImporter implements IssueImporter {
Map<String, Optional<User>> users = new HashMap<>();
ImportResult result = serverStep.getSetting().importIssues(repositoryStep.getSetting().getRepository(),
- project, retainIssueNumbers, optionStep.getSetting(), users, dryRun, logger);
+ project, optionStep.getSetting(), users, dryRun, logger);
return result.toHtml("Issues imported successfully");
}
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 514444c3dc..d3ea2db2a3 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
@@ -28,6 +28,11 @@ public class ImportRepository extends ImportOrganization {
this.repository = repository;
}
+ @Override
+ public boolean isIncludeForks() {
+ return super.isIncludeForks();
+ }
+
@SuppressWarnings("unused")
private static List<String> getRepositoryChoices() {
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/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java
index 1afc6f51df..beb044eb68 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
@@ -221,9 +221,10 @@ public class ImportServer implements Serializable, Validatable {
return userOpt.orElse(null);
}
- ImportResult importIssues(String gitHubRepo, Project oneDevProject, boolean useExistingIssueNumbers,
- IssueImportOption importOption, Map<String, Optional<User>> users, boolean dryRun, TaskLogger logger) {
+ ImportResult importIssues(String gitHubRepo, Project oneDevProject, IssueImportOption importOption,
+ Map<String, Optional<User>> users, boolean dryRun, TaskLogger logger) {
Client client = newClient();
+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);
try {
Set<String> nonExistentMilestones = new HashSet<>();
Set<String> nonExistentLogins = new HashSet<>();
@@ -277,12 +278,12 @@ public class ImportServer implements Serializable, Validatable {
issue.setDescription(issueNode.get("body").asText(null));
issue.setNumberScope(oneDevProject.getForkRoot());
- Long oldNumber = issueNode.get("number").asLong();
Long newNumber;
- if (dryRun || useExistingIssueNumbers)
+ Long oldNumber = issueNode.get("number").asLong();
+ if (dryRun || issueManager.find(oneDevProject, oldNumber) == null)
newNumber = oldNumber;
else
- newNumber = OneDev.getInstance(IssueManager.class).getNextNumber(oneDevProject);
+ newNumber = issueManager.getNextNumber(oneDevProject);
issue.setNumber(newNumber);
issueNumberMappings.put(oldNumber, newNumber);
@@ -430,7 +431,7 @@ public class ImportServer implements Serializable, Validatable {
if (issue.getDescription() != null)
issue.setDescription(migrator.migratePrefixed(issue.getDescription(), "#"));
- OneDev.getInstance(IssueManager.class).save(issue);
+ issueManager.save(issue);
for (IssueSchedule schedule: issue.getSchedules())
dao.persist(schedule);
for (IssueField field: issue.getFields())
@@ -452,6 +453,8 @@ public class ImportServer implements Serializable, Validatable {
return result;
} finally {
+ if (!dryRun)
+ issueManager.resetNextNumber(oneDevProject.getForkRoot());
client.close();
}
}
@@ -533,7 +536,7 @@ public class ImportServer implements Serializable, Validatable {
}
String importProjects(ImportRepositories repositories, ProjectImportOption option, boolean dryRun, TaskLogger logger) {
- Collection<Long> projectIds = new ArrayList<>();
+ Collection<Long> projectIdsToDelete = new ArrayList<>();
Client client = newClient();
try {
Map<String, Optional<User>> users = new HashMap<>();
@@ -545,13 +548,11 @@ public class ImportServer implements Serializable, Validatable {
String apiEndpoint = getApiEndpoint("/repos/" + projectMapping.getGitHubRepo());
JsonNode repoNode = get(client, apiEndpoint, logger);
- if (project.isNew()) {
- project.setDescription(repoNode.get("description").asText(null));
- project.setIssueManagement(repoNode.get("has_issues").asBoolean());
- boolean isPrivate = repoNode.get("private").asBoolean();
- if (!isPrivate && option.getPublicRole() != null)
- project.setDefaultRole(option.getPublicRole());
- }
+ project.setDescription(repoNode.get("description").asText(null));
+ project.setIssueManagement(repoNode.get("has_issues").asBoolean());
+ boolean isPrivate = repoNode.get("private").asBoolean();
+ if (!isPrivate && option.getPublicRole() != null)
+ project.setDefaultRole(option.getPublicRole());
if (project.isNew() || project.getDefaultBranch() == null) {
logger.log("Cloning code from repository " + projectMapping.getGitHubRepo() + "...");
@@ -569,9 +570,12 @@ public class ImportServer implements Serializable, Validatable {
try {
if (dryRun) {
new LsRemoteCommand(builder.build().toString()).refs("HEAD").quiet(true).run();
+ } else if (project.isNew()) {
+ projectManager.create(project);
+ projectManager.clone(project, builder.build().toString());
+ projectIdsToDelete.add(project.getId());
} else {
projectManager.clone(project, builder.build().toString());
- projectIds.add(project.getId());
}
} finally {
SensitiveMasker.pop();
@@ -608,7 +612,7 @@ public class ImportServer implements Serializable, Validatable {
logger.log("Importing issues from repository " + projectMapping.getGitHubRepo() + "...");
ImportResult currentResult = importIssues(projectMapping.getGitHubRepo(),
- project, true, option.getIssueImportOption(), users, dryRun, logger);
+ project, option.getIssueImportOption(), users, dryRun, logger);
result.nonExistentLogins.addAll(currentResult.nonExistentLogins);
result.nonExistentMilestones.addAll(currentResult.nonExistentMilestones);
result.unmappedIssueLabels.addAll(currentResult.unmappedIssueLabels);
@@ -619,7 +623,7 @@ public class ImportServer implements Serializable, Validatable {
return result.toHtml("Repositories imported successfully");
} catch (Exception e) {
- for (Long projectId: projectIds)
+ for (Long projectId: projectIdsToDelete)
OneDev.getInstance(StorageManager.class).deleteProjectDir(projectId);
throw new RuntimeException(e);
} finally {