Skip to content

The Unified and Autonomous Development Platform

Able to add/upload files directly on web UI on empty project

Robin Shen1decbace242f
diff --git a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
index 075fdc6744..d847d9bec6 100644
--- a/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
+++ b/server-core/src/main/java/io/onedev/server/git/BlobEdits.java
@@ -75,7 +75,7 @@ public class BlobEdits implements Serializable {
String parentPath, Set<String> currentOldPaths, Map<String, BlobContent> currentNewBlobs) {
try {
List<TreeFormatterEntry> entries = new ArrayList<>();
- while (treeWalk.next()) {
+ while (revTree != null && treeWalk.next()) {
String name = treeWalk.getNameString();
if (currentOldPaths.contains(name)) {
currentOldPaths.remove(name);
@@ -167,8 +167,12 @@ public class BlobEdits implements Serializable {
String path = entry.getKey();
if (path.startsWith(topLevelPathSegment + "/"))
childNewBlobs.put(path.substring(topLevelPathSegment.length()+1), entry.getValue());
- }
- ObjectId childTreeId = insertTree(revTree, treeWalk, inserter, treeWalk.getPathString(),
+ }
+ if (parentPath == null)
+ parentPath = topLevelPathSegment;
+ else
+ parentPath += "/" + topLevelPathSegment;
+ ObjectId childTreeId = insertTree(revTree, treeWalk, inserter, parentPath,
Sets.newHashSet(), childNewBlobs);
if (childTreeId != null)
entries.add(new TreeFormatterEntry(topLevelPathSegment, FileMode.TREE, childTreeId));
@@ -226,11 +230,16 @@ public class BlobEdits implements Serializable {
commit.setAuthor(authorAndCommitter);
commit.setCommitter(authorAndCommitter);
- commit.setParentId(parentCommitId);
commit.setMessage(commitMessage);
-
- RevTree revTree = revWalk.parseCommit(parentCommitId).getTree();
- treeWalk.addTree(revTree);
+
+ RevTree revTree;
+ if (!parentCommitId.equals(ObjectId.zeroId())) {
+ commit.setParentId(parentCommitId);
+ revTree = revWalk.parseCommit(parentCommitId).getTree();
+ treeWalk.addTree(revTree);
+ } else {
+ revTree = null;
+ }
ObjectId treeId = insertTree(revTree, treeWalk, inserter, null, new HashSet<>(oldPaths),
new HashMap<>(newBlobs));
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 2219510335..40800f3069 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -522,19 +522,16 @@ public class Project extends AbstractEntity {
*/
public List<Project> getForkDescendants() {
List<Project> descendants = new ArrayList<>();
- if (getDefaultBranch() != null)
- descendants.add(this);
- for (Project fork: getForks()) {
+ descendants.add(this);
+ for (Project fork: getForks())
descendants.addAll(fork.getForkDescendants());
- }
return descendants;
}
public Repository getRepository() {
- if (repository == null) {
+ if (repository == null)
repository = OneDev.getInstance(ProjectManager.class).getRepository(this);
- }
return repository;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java b/server-core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java
index 739ec9caee..bc3069361e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java
@@ -28,12 +28,14 @@ public class ProjectAndRevision implements Serializable {
public ProjectAndRevision(Long projectId, String revision) {
this.projectId = projectId;
- this.revision = revision;
+ if (StringUtils.isNotBlank(revision))
+ this.revision = revision;
+ else
+ this.revision = null;
}
public ProjectAndRevision(Project project, String revision) {
- this.projectId = project.getId();
- this.revision = revision;
+ this(project.getId(), revision);
}
public ProjectAndRevision(String projectAndRevision) {
diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index fba8fb711a..95243d4e07 100644
--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -51,7 +51,6 @@ import io.onedev.server.web.page.my.MyPasswordPage;
import io.onedev.server.web.page.my.MyProfilePage;
import io.onedev.server.web.page.my.MyTokenPage;
import io.onedev.server.web.page.project.NewProjectPage;
-import io.onedev.server.web.page.project.NoCommitsPage;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
@@ -263,8 +262,6 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/settings/build", BuildSettingPage.class));
add(new OnePageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));
add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));
-
- add(new OnePageMapper("projects/${project}/no-commits", NoCommitsPage.class));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java
index 751acbce90..25271f9964 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/BranchPicker.java
@@ -50,7 +50,7 @@ public abstract class BranchPicker extends DropdownLink {
@Override
public IModel<?> getBody() {
return Model.of(String.format("<i class='fa fa-code-fork'></i> <span>%s</span> <i class='fa fa-caret-down'></i>",
- HtmlEscape.escapeHtml5(branch)));
+ branch!=null?HtmlEscape.escapeHtml5(branch):"<i>choose</i>"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java
index b76ffdcac9..e950da87ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java
@@ -7,6 +7,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.ObjectId;
+import org.unbescape.html.HtmlEscape;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
@@ -73,21 +74,31 @@ public abstract class RevisionPicker extends DropdownLink {
@Override
public IModel<?> getBody() {
String iconClass;
- ProjectAndRevision repoAndRevision = new ProjectAndRevision(projectModel.getObject(), revision);
- String label = repoAndRevision.getBranch();
- if (label != null) {
+ String label;
+ if ("master".equals(revision)) { // default to use master branch when project is empty
+ label = "master";
iconClass = "fa fa-code-fork";
- } else {
- label = repoAndRevision.getTag();
+ } else if (revision != null) {
+ ProjectAndRevision projectAndRevision = new ProjectAndRevision(projectModel.getObject(), revision);
+ label = projectAndRevision.getBranch();
if (label != null) {
- iconClass = "fa fa-tag";
+ iconClass = "fa fa-code-fork";
} else {
- label = revision;
- if (ObjectId.isId(label))
- label = GitUtils.abbreviateSHA(label);
- iconClass = "fa fa-ext fa-commit";
- }
- }
+ label = projectAndRevision.getTag();
+ if (label != null) {
+ iconClass = "fa fa-tag";
+ } else {
+ label = revision;
+ if (ObjectId.isId(label))
+ label = GitUtils.abbreviateSHA(label);
+ iconClass = "fa fa-ext fa-commit";
+ }
+ }
+ label = HtmlEscape.escapeHtml5(label);
+ } else {
+ label = "<i>choose</i>";
+ iconClass = "fa fa-ext fa-commit";
+ }
return Model.of(String.format("<i class='%s'></i> <span>%s</span> <i class='fa fa-caret-down'></i>", iconClass, label));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.html
deleted file mode 100644
index d753030a9c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<wicket:extend>
- <div class="no-commits">
- <div class="head">Project does not have any commits yet</div>
- <div class="body">
- <div>You may initialize code of the project from command line:</div>
- <ul class="list-unstyled">
- <li>touch README.md</li>
- <li>git init</li>
- <li>git add README.md</li>
- <li>git commit -m "first commit"</li>
- <li>git remote add origin <span wicket:id="url1"></span></li>
- <li>git push -u origin master</li>
- </ul>
- <div>Or push an existing repository from command line:</div>
- <ul class="list-unstyled">
- <li>git remote add origin <span wicket:id="url2"></span></li>
- <li>git push -u origin master</li>
- </ul>
- <div class="help-block"><i class="fa fa-info-circle"></i> In case remote <em>origin</em> already exists, use another name other than <em>origin</em>, or run command <em>git remote set-url origin <span wicket:id="url3"></span></em> instead</div>
- </div>
- </div>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java
deleted file mode 100644
index 98dee6772b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package io.onedev.server.web.page.project;
-
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.util.SecurityUtils;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.issues.list.IssueListPage;
-
-@SuppressWarnings("serial")
-public class NoCommitsPage extends ProjectPage {
-
- public NoCommitsPage(PageParameters params) {
- super(params);
-
- if (getProject().getDefaultBranch() != null) {
- if (SecurityUtils.canReadCode(getProject().getFacade()))
- throw new RestartResponseException(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));
- else
- throw new RestartResponseException(IssueListPage.class, ProjectBlobPage.paramsOf(getProject()));
- }
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new Label("url1", getProject().getUrl()));
- add(new Label("url2", getProject().getUrl()));
- add(new Label("url3", getProject().getUrl()));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index b4cddda03b..377a5e7dea 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -7,7 +7,6 @@ import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
-import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
@@ -123,13 +122,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
// we do not need to reload the project this time as we already have that object on hand
projectModel.setObject(project);
-
- if (!(this instanceof NoCommitsPage)
- && SecurityUtils.canReadCode(getProject().getFacade())
- && !(this instanceof ProjectSettingPage)
- && getProject().getDefaultBranch() == null) {
- throw new RestartResponseException(NoCommitsPage.class, paramsOf(getProject()));
- }
}
protected Map<String, ObjectId> getObjectIdCache() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 2a9deaf4bf..1c9b9c116a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -172,7 +172,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
if (modeStr != null)
state.mode = Mode.valueOf(modeStr.toUpperCase());
- resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);
+ if (state.blobIdent.revision != null)
+ resolvedRevision = getProject().getObjectId(state.blobIdent.revision, true);
state.position = params.get(PARAM_POSITION).toString();
@@ -222,11 +223,15 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
protected void onConfigure() {
super.onConfigure();
- RevCommit commit = getProject().getRevCommit(resolvedRevision, true);
- IndexManager indexManager = OneDev.getInstance(IndexManager.class);
- if (!indexManager.isIndexed(getProject(), commit)) {
- OneDev.getInstance(IndexManager.class).indexAsync(getProject(), commit);
- setVisible(true);
+ if (resolvedRevision != null) {
+ RevCommit commit = getProject().getRevCommit(resolvedRevision, true);
+ IndexManager indexManager = OneDev.getInstance(IndexManager.class);
+ if (!indexManager.isIndexed(getProject(), commit)) {
+ OneDev.getInstance(IndexManager.class).indexAsync(getProject(), commit);
+ setVisible(true);
+ } else {
+ setVisible(false);
+ }
} else {
setVisible(false);
}
@@ -343,14 +348,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
AtomicBoolean reviewRequired = new AtomicBoolean(true);
try {
- reviewRequired.set(getProject().isReviewRequiredForModification(getLoginUser(), revision, null));
+ reviewRequired.set(revision!=null && getProject().isReviewRequiredForModification(getLoginUser(), revision, null));
} catch (Exception e) {
logger.error("Error checking review requirement", e);
}
AtomicBoolean buildRequired = new AtomicBoolean(true);
try {
- buildRequired.set(getProject().isBuildRequiredForModification(getLoginUser(), revision, null));
+ buildRequired.set(revision!=null && getProject().isBuildRequiredForModification(getLoginUser(), revision, null));
} catch (Exception e) {
logger.error("Error checking build requirement", e);
}
@@ -539,17 +544,17 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
return menuItems;
}
-
+
});
- String compareWith = resolvedRevision.name();
+ String compareWith = resolvedRevision!=null?resolvedRevision.name():null;
String query;
if (state.blobIdent.path != null)
- query = String.format("path(%s)", ProjectBlobPage.this.state.blobIdent.path);
+ query = String.format("path(%s)", state.blobIdent.path);
else
query = null;
blobOperations.add(new ViewStateAwarePageLink<Void>("history", ProjectCommitsPage.class,
- ProjectCommitsPage.paramsOf(getProject(), query, compareWith)));
+ ProjectCommitsPage.paramsOf(getProject(), query, compareWith)).setVisible(resolvedRevision!=null));
blobOperations.add(new ArchiveMenuLink("download", projectModel) {
@@ -561,7 +566,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(state.blobIdent.path == null);
+ setVisible(state.blobIdent.revision != null && state.blobIdent.path == null);
}
});
@@ -673,8 +678,17 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
}
private void newRevisionPicker(@Nullable AjaxRequestTarget target) {
- Component revisionPicker = new RevisionPicker(REVISION_PICKER_ID, projectModel, state.blobIdent.revision, true) {
-
+ String revision = state.blobIdent.revision;
+ boolean canCreateRef;
+ if (revision == null) {
+ revision = "master";
+ canCreateRef = false;
+ } else {
+ canCreateRef = true;
+ }
+
+ Component revisionPicker = new RevisionPicker(REVISION_PICKER_ID, projectModel, revision, canCreateRef) {
+
@Override
protected String getRevisionUrl(String revision) {
BlobIdent blobIdent = new BlobIdent(revision, null, FileMode.TREE.getBits());
@@ -952,7 +966,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
@Override
public boolean isOnBranch() {
- return getProject().getBranchRef(state.blobIdent.revision) != null;
+ return state.blobIdent.revision == null || getProject().getBranchRef(state.blobIdent.revision) != null;
}
@Override
@@ -963,7 +977,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
@Override
public Collection<String> getWebSocketObservables() {
Collection<String> observables = super.getWebSocketObservables();
- observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision, true).name()));
+ if (resolvedRevision != null)
+ observables.add(CommitIndexed.getWebSocketObservable(getProject().getRevCommit(resolvedRevision, true).name()));
if (state.requestId != null)
observables.add(PullRequest.getWebSocketObservable(state.requestId));
if (state.commentId != null)
@@ -1025,7 +1040,12 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
@Override
public void onCommitted(@Nullable AjaxRequestTarget target, RefUpdated refUpdated, @Nullable String position) {
Project project = getProject();
+ if (state.blobIdent.revision == null) {
+ state.blobIdent.revision = "master";
+ project.setDefaultBranch("master");
+ }
String branch = state.blobIdent.revision;
+
getProject().cacheObjectId(branch, refUpdated.getNewCommitId());
Long projectId = project.getId();
@@ -1210,9 +1230,13 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
}
BlobEdits blobEdits = new BlobEdits(Sets.newHashSet(), newBlobs);
- String refName = GitUtils.branch2ref(blobIdent.revision);
+ String refName = blobIdent.revision!=null?GitUtils.branch2ref(blobIdent.revision):"refs/heads/master";
- ObjectId prevCommitId = getProject().getObjectId(blobIdent.revision, true);
+ ObjectId prevCommitId;
+ if (blobIdent.revision != null)
+ prevCommitId = getProject().getObjectId(blobIdent.revision, true);
+ else
+ prevCommitId = ObjectId.zeroId();
while (true) {
try {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
index 31872f8bc0..dd8aa86222 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java
@@ -155,7 +155,10 @@ public class BlobNavigator extends Panel {
@Override
public Iterator<? extends BlobIdent> getRoots() {
- return context.getProject().getChildren(blobIdent, BlobIdentFilter.ALL).iterator();
+ if (blobIdent.revision != null)
+ return context.getProject().getChildren(blobIdent, BlobIdentFilter.ALL).iterator();
+ else
+ return new ArrayList<BlobIdent>().iterator();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
index 8881da0770..c7941d95c2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css
@@ -20,6 +20,9 @@ body.ProjectBlobPage.additionalWidth3 {
padding: 0;
border-right: 1px solid #E0E0E0;
}
+#project-blob>.head>.revision-picker:empty {
+ display: none;
+}
#project-blob>.head>.comment-context {
border-right: 1px solid #E0E0E0;
padding: 5px 8px 0 8px;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
index 4eced3f9cb..2b2c33db6f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java
@@ -308,21 +308,26 @@ public abstract class CommitOptionPanel extends Panel {
commitMessage += "\n\n" + commitDetail;
User user = Preconditions.checkNotNull(OneDev.getInstance(UserManager.class).getCurrent());
- String refName = GitUtils.branch2ref(context.getBlobIdent().revision);
- ObjectId prevCommitId = context.getProject().getObjectId(context.getBlobIdent().revision, true);
+ String revision = context.getBlobIdent().revision;
+
+ String refName = revision!=null?GitUtils.branch2ref(revision):"refs/heads/master";
+ ObjectId prevCommitId;
+ if (revision != null)
+ prevCommitId = context.getProject().getObjectId(revision, true);
+ else
+ prevCommitId = ObjectId.zeroId();
Repository repository = context.getProject().getRepository();
ObjectId newCommitId = null;
Map<String, BlobContent> newBlobs = new HashMap<>();
if (newContentProvider != null) {
- String revision = context.getBlobIdent().revision;
String newPath = context.getNewPath();
- if (context.getProject().isReviewRequiredForModification(user, revision, newPath)) {
+ if (revision != null && context.getProject().isReviewRequiredForModification(user, revision, newPath)) {
CommitOptionPanel.this.error("Review required for this change. Please submit pull request instead");
target.add(feedback);
return false;
- } else if (context.getProject().isBuildRequiredForModification(user, revision, newPath)) {
+ } else if (revision != null && context.getProject().isBuildRequiredForModification(user, revision, newPath)) {
CommitOptionPanel.this.error("Build required for this change. Please submit pull request instead");
target.add(feedback);
return false;
@@ -362,14 +367,15 @@ public abstract class CommitOptionPanel extends Panel {
break;
} catch (ObsoleteCommitException e) {
try (RevWalk revWalk = new RevWalk(repository)) {
- RevCommit prevCommit = revWalk.parseCommit(prevCommitId);
+ ObjectId lastPrevCommitId = prevCommitId;
send(this, Broadcast.BUBBLE, new RevisionResolved(target, e.getOldCommitId()));
- RevCommit currentCommit = revWalk.parseCommit(e.getOldCommitId());
prevCommitId = e.getOldCommitId();
+ RevCommit prevCommit = revWalk.parseCommit(prevCommitId);
if (!oldPaths.isEmpty()) {
+ RevCommit lastPrevCommit = revWalk.parseCommit(lastPrevCommitId);
TreeWalk treeWalk = TreeWalk.forPath(repository, oldPaths.iterator().next(),
- prevCommit.getTree().getId(), currentCommit.getTree().getId());
+ lastPrevCommit.getTree().getId(), prevCommit.getTree().getId());
Preconditions.checkNotNull(treeWalk);
if (!treeWalk.getObjectId(0).equals(treeWalk.getObjectId(1))
|| !treeWalk.getFileMode(0).equals(treeWalk.getFileMode(1))) {
@@ -378,13 +384,13 @@ public abstract class CommitOptionPanel extends Panel {
if (treeWalk.getObjectId(1).equals(ObjectId.zeroId())) {
if (newContentProvider != null) {
oldPaths.clear();
- change = getChange(treeWalk, prevCommit, currentCommit);
+ change = getChange(treeWalk, lastPrevCommit, prevCommit);
break;
} else {
newCommitId = e.getOldCommitId();
}
} else {
- change = getChange(treeWalk, prevCommit, currentCommit);
+ change = getChange(treeWalk, lastPrevCommit, prevCommit);
break;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java
index 07ab3e26cd..73d0565734 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java
@@ -13,7 +13,9 @@ public class FolderViewRendererProvider implements BlobRendererContribution {
@Override
public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.VIEW && context.getBlobIdent().isTree()) {
+ if (context.getMode() == Mode.VIEW
+ && context.getBlobIdent().revision != null
+ && context.getBlobIdent().isTree()) {
return new PrioritizedComponentRenderer() {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java
new file mode 100644
index 0000000000..18b6c2cf84
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.project.blob.render.renderers.nocommits;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class NoCommitsCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public NoCommitsCssResourceReference() {
+ super(NoCommitsCssResourceReference.class, "no-commits.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
new file mode 100644
index 0000000000..afa8f55c1b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
@@ -0,0 +1,13 @@
+<wicket:panel>
+ <div class="no-commits">
+ <div class="head">Project does not have any commits yet</div>
+ <div class="body">
+ <div>You may initialize code of the project by adding files from right top of the page, or push an existing repository from command prompt:</div>
+ <code>
+ <div>git remote add origin <span wicket:id="url1"></span></div>
+ <div>git push -u origin master</div>
+ </code>
+ <div class="help-block"><i class="fa fa-info-circle"></i> In case remote <em>origin</em> already exists, use another name other than <em>origin</em>, or run command <em>git remote set-url origin <span wicket:id="url2"></span></em> instead</div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
new file mode 100644
index 0000000000..d861fdf145
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
@@ -0,0 +1,35 @@
+package io.onedev.server.web.page.project.blob.render.renderers.nocommits;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+
+@SuppressWarnings("serial")
+public class NoCommitsPanel extends Panel {
+
+ private final BlobRenderContext context;
+
+ public NoCommitsPanel(String id, BlobRenderContext context) {
+ super(id);
+ this.context = context;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("url1", context.getProject().getUrl()));
+ add(new Label("url2", context.getProject().getUrl()));
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new NoCommitsCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsRendererProvider.java
new file mode 100644
index 0000000000..0756625622
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsRendererProvider.java
@@ -0,0 +1,37 @@
+package io.onedev.server.web.page.project.blob.render.renderers.nocommits;
+
+import org.apache.wicket.Component;
+
+import io.onedev.server.web.PrioritizedComponentRenderer;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
+
+public class NoCommitsRendererProvider implements BlobRendererContribution {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
+ if (context.getMode() == Mode.VIEW && context.getBlobIdent().revision == null) {
+ return new PrioritizedComponentRenderer() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId) {
+ return new NoCommitsPanel(componentId, context);
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+ };
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
new file mode 100644
index 0000000000..cabb738835
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
@@ -0,0 +1,17 @@
+.no-commits {
+ padding: 20px;
+}
+.no-commits>.head {
+ font-size: 18px;
+ font-weight: bold;
+ margin-bottom: 20px;
+}
+.no-commits>.body>* {
+ margin-bottom: 20px;
+}
+.no-commits>.body>code {
+ display: block;
+ color: #444;
+ background: #F5F5F5;
+ padding: 8px;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
index 68200e4788..7f3f273103 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java
@@ -152,10 +152,14 @@ public abstract class AdvancedSearchPanel extends Panel {
@Override
protected void runTask(AjaxRequestTarget target) {
List<QueryHit> hits;
- try {
- hits = option.query(AdvancedSearchPanel.this);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
+ if (revisionModel.getObject() != null) {
+ try {
+ hits = option.query(AdvancedSearchPanel.this);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ hits = new ArrayList<>();
}
HashMap<Class<?>, SearchOption> savedOptions = getSavedOptions();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
index 703580df7a..43eec45589 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
@@ -172,7 +172,7 @@ public abstract class QuickSearchPanel extends Panel {
if (key.equals("input")) {
searchInput = params.getParameterValue("param").toString();
- if (StringUtils.isNotBlank(searchInput)) {
+ if (StringUtils.isNotBlank(searchInput) && revisionModel.getObject() != null) {
symbolHits = querySymbols(searchInput, MAX_QUERY_ENTRIES);
} else {
symbolHits = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 05ab4cfb10..4c2b69e66c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -256,7 +256,7 @@ public class ProjectBranchesPage extends ProjectPage {
baseBranch = params.get(PARAM_BASE).toString();
if (baseBranch == null)
- baseBranch = Preconditions.checkNotNull(getProject().getDefaultBranch());
+ baseBranch = getProject().getDefaultBranch();
query = params.get(PARAM_QUERY).toString();
pagingHistorySupport = new PagingHistorySupport() {
@@ -388,6 +388,10 @@ public class ProjectBranchesPage extends ProjectPage {
form.error("Branch name is required.");
target.focusComponent(nameInput);
target.add(form);
+ } else if (branchRevision == null) {
+ form.error("Create from is required.");
+ target.focusComponent(nameInput);
+ target.add(form);
} else if (!Repository.isValidRefName(Constants.R_HEADS + branchName)) {
form.error("Invalid branch name.");
target.focusComponent(nameInput);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
index 1200419631..a3499dc3a7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
@@ -41,9 +41,11 @@
<div>
<a wicket:id="createRequest" class="btn btn-primary">Create Pull Request</a>
</div>
- <div wicket:id="unrelatedHistory" class="alert alert-danger">
- <span class="fa fa-lg fa-warning"></span>
- <span>History of comparing revisions is unrelated.</span>
+ <div wicket:id="revisionNotSpecified" class="alert alert-warning">
+ <span>Please select revisions to compare</span>
+ </div>
+ <div wicket:id="unrelatedHistory" class="alert alert-warning">
+ <span>History of comparing revisions is unrelated</span>
</div>
<ul wicket:id="tabs" class="nav nav-tabs"></ul>
<div wicket:id="tabPanel" class="tab-panel"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 5b3cc7da2c..02dc18f941 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -136,8 +136,14 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
}
public static void fillParams(PageParameters params, State state) {
- params.add(PARAM_LEFT, state.leftSide.toString());
- params.add(PARAM_RIGHT, state.rightSide.toString());
+ if (state.leftSide.getRevision() != null)
+ params.add(PARAM_LEFT, state.leftSide.toString());
+ else
+ params.add(PARAM_LEFT, state.leftSide.getProjectId());
+ if (state.rightSide.getRevision() != null)
+ params.add(PARAM_RIGHT, state.rightSide.toString());
+ else
+ params.add(PARAM_RIGHT, state.rightSide.getProjectId());
params.add(PARAM_COMPARE_WITH_MERGE_BASE, state.compareWithMergeBase);
if (state.whitespaceOption != WhitespaceOption.DEFAULT)
params.add(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());
@@ -163,20 +169,26 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
super(params);
String str = params.get(PARAM_LEFT).toString();
- if (str != null) {
+ if (str != null)
state.leftSide = new ProjectAndRevision(str);
- } else {
+ else if (getProject().getDefaultBranch() != null)
state.leftSide = new ProjectAndRevision(getProject(), getProject().getDefaultBranch());
- }
- leftCommitId = state.leftSide.getCommit().copy();
+ else
+ state.leftSide = new ProjectAndRevision(getProject(), null);
+
+ if (state.leftSide.getRevision() != null)
+ leftCommitId = state.leftSide.getCommit().copy();
str = params.get(PARAM_RIGHT).toString();
- if (str != null) {
+ if (str != null)
state.rightSide = new ProjectAndRevision(str);
- } else {
+ else if (getProject().getDefaultBranch() != null)
state.rightSide = new ProjectAndRevision(getProject(), getProject().getDefaultBranch());
- }
- rightCommitId = state.rightSide.getCommit().copy();
+ else
+ state.rightSide = new ProjectAndRevision(getProject(), null);
+
+ if (state.rightSide.getRevision() != null)
+ rightCommitId = state.rightSide.getCommit().copy();
state.compareWithMergeBase = params.get(PARAM_COMPARE_WITH_MERGE_BASE).toBoolean(true);
@@ -187,9 +199,8 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
* merge base commit and right side revision are guaranteed to be both in right side
* project
*/
- if (!state.compareWithMergeBase && !state.leftSide.getProject().equals(state.rightSide.getProject())) {
+ if (!state.compareWithMergeBase && !state.leftSide.getProject().equals(state.rightSide.getProject()))
throw new IllegalArgumentException("Can only compare with common ancestor when different projects are involved");
- }
state.pathFilter = params.get(PARAM_PATH_FILTER).toString();
state.blameFile = params.get(PARAM_BLAME_FILE).toString();
@@ -215,9 +226,11 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
};
- mergeBase = GitUtils.getMergeBase(
- state.leftSide.getProject().getRepository(), leftCommitId,
- state.rightSide.getProject().getRepository(), rightCommitId);
+ if (leftCommitId != null && rightCommitId != null) {
+ mergeBase = GitUtils.getMergeBase(
+ state.leftSide.getProject().getRepository(), leftCommitId,
+ state.rightSide.getProject().getRepository(), rightCommitId);
+ }
}
@Override
@@ -297,15 +310,27 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
add(new WebMarkupContainer("mergeBaseTooltip").add(AttributeAppender.append("title", tooltip)));
- PageParameters params = CommitDetailPage.paramsOf(state.leftSide.getProject(), state.leftSide.getCommit().name());
- Link<Void> leftCommitLink = new ViewStateAwarePageLink<Void>("leftCommitLink", CommitDetailPage.class, params);
- leftCommitLink.add(new Label("message", state.leftSide.getCommit().getShortMessage()));
- add(leftCommitLink);
-
- params = CommitDetailPage.paramsOf(state.rightSide.getProject(), state.rightSide.getCommit().name());
- Link<Void> rightCommitLink = new ViewStateAwarePageLink<Void>("rightCommitLink", CommitDetailPage.class, params);
- rightCommitLink.add(new Label("message", state.rightSide.getCommit().getShortMessage()));
- add(rightCommitLink);
+ if (state.leftSide.getRevision() != null) {
+ PageParameters params = CommitDetailPage.paramsOf(state.leftSide.getProject(), state.leftSide.getCommit().name());
+ Link<Void> leftCommitLink = new ViewStateAwarePageLink<Void>("leftCommitLink", CommitDetailPage.class, params);
+ leftCommitLink.add(new Label("message", state.leftSide.getCommit().getShortMessage()));
+ add(leftCommitLink);
+ } else {
+ WebMarkupContainer leftCommitLink = new WebMarkupContainer("leftCommitLink");
+ leftCommitLink.add(new WebMarkupContainer("message"));
+ add(leftCommitLink.setVisible(false));
+ }
+
+ if (state.rightSide.getRevision() != null) {
+ PageParameters params = CommitDetailPage.paramsOf(state.rightSide.getProject(), state.rightSide.getCommit().name());
+ Link<Void> rightCommitLink = new ViewStateAwarePageLink<Void>("rightCommitLink", CommitDetailPage.class, params);
+ rightCommitLink.add(new Label("message", state.rightSide.getCommit().getShortMessage()));
+ add(rightCommitLink);
+ } else {
+ WebMarkupContainer rightCommitLink = new WebMarkupContainer("rightCommitLink");
+ rightCommitLink.add(new WebMarkupContainer("message"));
+ add(rightCommitLink.setVisible(false));
+ }
add(new AffinalRevisionPicker("rightRevSelector",
state.rightSide.getProjectId(), state.rightSide.getRevision()) {
@@ -428,12 +453,22 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
});
+ add(new WebMarkupContainer("revisionNotSpecified") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(leftCommitId == null || rightCommitId == null);
+ }
+
+ });
+
add(new WebMarkupContainer("unrelatedHistory") {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(mergeBase == null);
+ setVisible(leftCommitId != null && rightCommitId != null && mergeBase == null);
}
});
@@ -619,7 +654,8 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
@Override
protected void onDetach() {
- requestModel.detach();
+ if (getProject().getDefaultBranch() != null)
+ requestModel.detach();
super.onDetach();
}
@@ -749,13 +785,15 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {
@Override
public Collection<String> getWebSocketObservables() {
Collection<String> observables = super.getWebSocketObservables();
- if (state.compareWithMergeBase)
- observables.add(CommitIndexed.getWebSocketObservable(mergeBase.name()));
- else
- observables.add(CommitIndexed.getWebSocketObservable(state.leftSide.getCommit().name()));
- observables.add(CommitIndexed.getWebSocketObservable(state.rightSide.getCommit().name()));
- if (state.commentId != null)
- observables.add(CodeComment.getWebSocketObservable(state.commentId));
+ if (getProject().getDefaultBranch() != null) {
+ if (state.compareWithMergeBase)
+ observables.add(CommitIndexed.getWebSocketObservable(mergeBase.name()));
+ else
+ observables.add(CommitIndexed.getWebSocketObservable(state.leftSide.getCommit().name()));
+ observables.add(CommitIndexed.getWebSocketObservable(state.rightSide.getCommit().name()));
+ if (state.commentId != null)
+ observables.add(CodeComment.getWebSocketObservable(state.commentId));
+ }
return observables;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/project.css b/server-core/src/main/java/io/onedev/server/web/page/project/project.css
index 07cbb5bc1e..fe99b6f6fc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/project.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/project.css
@@ -58,29 +58,6 @@
top: 64px;
}
-.no-commits>.head {
- font-size: 20px;
- font-weight: bold;
- margin-bottom: 20px;
- color: #444;
-}
-.no-commits {
- padding: 20px;
-}
-.no-commits>.body>ul {
- background: #EEE;
- border-radius: 4px;
- padding: 4px;
- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
- margin: 4px 0 16px 0;
-}
-.no-commits>.body>ul>li:before {
- content: "$";
- margin-right: 8px;
-}
-.no-commits>.body>.help-block {
- margin-top: -8px;
-}
.project-nav-context-dropdown .info {
margin: -20px;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
index f3e20b381a..c10895f68b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.html
@@ -52,9 +52,16 @@
</div>
</wicket:fragment>
<wicket:fragment wicket:id="unrelatedHistoryFrag">
- <div class="alert alert-danger">
+ <div class="alert alert-warning">
+ <div class="summary">
+ <span>History of target branch and source branch is unrelated</span>
+ </div>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="branchNotSpecifiedFrag">
+ <div class="alert alert-warning">
<div class="summary">
- <span>History of target branch and source branch is unrelated.</span>
+ <span>Please select branches to create pull request</span>
</div>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 4041111f9c..fd3b3d0288 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -108,8 +108,14 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
public static PageParameters paramsOf(Project project, ProjectAndBranch target, ProjectAndBranch source) {
PageParameters params = paramsOf(project);
- params.set("target", target.toString());
- params.set("source", source.toString());
+ if (target.getBranch() != null)
+ params.set("target", target.toString());
+ else
+ params.set("target", target.getProjectId());
+ if (source.getBranch() != null)
+ params.set("source", source.toString());
+ else
+ params.set("source", source.getProjectId());
return params;
}
@@ -142,13 +148,17 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
target = new ProjectAndBranch(targetParam);
} else {
suggestedSourceBranch = suggestSourceBranch();
- if (!suggestedSourceBranch.equals(getProject().getDefaultBranch())) {
- target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());
- } else if (getProject().getForkedFrom() != null && SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade())) {
- target = new ProjectAndBranch(getProject().getForkedFrom(),
- getProject().getForkedFrom().getDefaultBranch());
+ if (suggestedSourceBranch != null) {
+ if (!suggestedSourceBranch.equals(getProject().getDefaultBranch())) {
+ target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());
+ } else if (getProject().getForkedFrom() != null && SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade())) {
+ target = new ProjectAndBranch(getProject().getForkedFrom(),
+ getProject().getForkedFrom().getDefaultBranch());
+ } else {
+ target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());
+ }
} else {
- target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());
+ target = new ProjectAndBranch(getProject(), null);
}
}
@@ -164,13 +174,18 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
PullRequest prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());
if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen())
pullRequestRef.set(prevRequest);
- else
+ else if (target.getBranch() != null || source.getBranch() != null)
pullRequestRef.set(OneDev.getInstance(PullRequestManager.class).findEffective(target, source));
if (pullRequestRef.get() == null) {
- ObjectId baseCommitId = GitUtils.getMergeBase(
- target.getProject().getRepository(), target.getObjectId(),
- source.getProject().getRepository(), source.getObjectId());
+ ObjectId baseCommitId;
+ if (target.getBranch() != null && source.getBranch() != null) {
+ baseCommitId = GitUtils.getMergeBase(
+ target.getProject().getRepository(), target.getObjectId(),
+ source.getProject().getRepository(), source.getObjectId());
+ } else {
+ baseCommitId = null;
+ }
if (baseCommitId != null) {
PullRequest request = new PullRequest();
request.setTitle(StringUtils.capitalize(source.getBranch().replace('-', ' ').replace('_', ' ').toLowerCase()));
@@ -260,10 +275,18 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
}
});
- PageParameters params = CommitDetailPage.paramsOf(target.getProject(), target.getObjectName());
- Link<Void> targetCommitLink = new ViewStateAwarePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);
- targetCommitLink.add(new Label("message", target.getCommit().getShortMessage()));
- add(targetCommitLink);
+
+ if (target.getBranch() != null) {
+ PageParameters params = CommitDetailPage.paramsOf(target.getProject(), target.getObjectName());
+ Link<Void> targetCommitLink = new ViewStateAwarePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);
+ targetCommitLink.add(new Label("message", target.getCommit().getShortMessage()));
+ add(targetCommitLink);
+ } else {
+ WebMarkupContainer targetCommitLink = new WebMarkupContainer("targetCommitLink");
+ targetCommitLink.add(new WebMarkupContainer("message"));
+ targetCommitLink.setVisible(false);
+ add(targetCommitLink);
+ }
add(new AffinalBranchPicker("source", source.getProjectId(), source.getBranch()) {
@@ -278,10 +301,18 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
}
});
- params = CommitDetailPage.paramsOf(source.getProject(), source.getObjectName());
- Link<Void> sourceCommitLink = new ViewStateAwarePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);
- sourceCommitLink.add(new Label("message", source.getCommit().getShortMessage()));
- add(sourceCommitLink);
+
+ if (source.getBranch() != null) {
+ PageParameters params = CommitDetailPage.paramsOf(source.getProject(), source.getObjectName());
+ Link<Void> sourceCommitLink = new ViewStateAwarePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);
+ sourceCommitLink.add(new Label("message", source.getCommit().getShortMessage()));
+ add(sourceCommitLink);
+ } else {
+ WebMarkupContainer sourceCommitLink = new WebMarkupContainer("sourceCommitLink");
+ sourceCommitLink.add(new WebMarkupContainer("message"));
+ sourceCommitLink.setVisible(false);
+ add(sourceCommitLink);
+ }
add(new Link<Void>("swap") {
@@ -295,17 +326,18 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
Fragment fragment;
PullRequest request = getPullRequest();
- if (request == null) {
+ if (target.getBranch() == null || source.getBranch() == null)
+ fragment = newBranchNotSpecifiedFrag();
+ else if (request == null)
fragment = newUnrelatedHistoryFrag();
- } else if (request.getId() != null && (request.isOpen() || !request.isMergeIntoTarget())) {
+ else if (request.getId() != null && (request.isOpen() || !request.isMergeIntoTarget()))
fragment = newEffectiveFrag();
- } else if (request.getSource().equals(request.getTarget())) {
+ else if (request.getSource().equals(request.getTarget()))
fragment = newSameBranchFrag();
- } else if (request.isMerged()) {
+ else if (request.isMerged())
fragment = newAcceptedFrag();
- } else {
+ else
fragment = newCanSendFrag();
- }
add(fragment);
if (getPullRequest() != null) {
@@ -509,6 +541,10 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
return new Fragment("status", "unrelatedHistoryFrag", this);
}
+ private Fragment newBranchNotSpecifiedFrag() {
+ return new Fragment("status", "branchNotSpecifiedFrag", this);
+ }
+
private Fragment newAcceptedFrag() {
Fragment fragment = new Fragment("status", "mergedFrag", this);
fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource(), null));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
index 72d8241857..ea1bfbfa83 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java
@@ -46,7 +46,10 @@ public class ProjectContribsPage extends ProjectStatsPage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Label("note", "Contributions to " + getProject().getDefaultBranch() + " branch, excluding merge commits"));
+ if (getProject().getDefaultBranch() != null)
+ add(new Label("note", "Contributions to " + getProject().getDefaultBranch() + " branch, excluding merge commits"));
+ else
+ add(new WebMarkupContainer("note").setVisible(false));
add(new WebMarkupContainer(USER_DETAIL_ID).setOutputMarkupId(true));
add(userDetailBehavior = new AbstractPostAjaxBehavior() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
index 94cfd4b805..610b89f3d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java
@@ -6,7 +6,6 @@ import java.util.Map;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.unbescape.javascript.JavaScriptEscape;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,9 +31,11 @@ public class SourceLinesPage extends ProjectStatsPage {
data.put(entry.getKey().getDate().getTime(), entry.getValue());
}
try {
- String jsonOfData = OneDev.getInstance(ObjectMapper.class).writeValueAsString(data);
- String script = String.format("onedev.server.stats.sourceLines.onDomReady(%s, '%s');",
- jsonOfData, JavaScriptEscape.escapeJavaScript(getProject().getDefaultBranch()));
+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
+ String jsonOfData = mapper.writeValueAsString(data);
+ String jsonOfDefaultBranch = mapper.writeValueAsString(getProject().getDefaultBranch());
+ String script = String.format("onedev.server.stats.sourceLines.onDomReady(%s, %s);",
+ jsonOfData, jsonOfDefaultBranch);
response.render(OnDomReadyHeaderItem.forScript(script));
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
index b06190d90e..dc8ba2c7e1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css
@@ -3,10 +3,9 @@ body.SourceLinesPage {
}
#project-contribs .options {
margin-bottom: 20px;
- padding-bottom: 8px;
- border-bottom: 1px solid #EEE;
}
#project-stats .note {
+ border-top: 1px solid #EEE;
margin-bottom: 20px;
color: #666;
font-size: 16px;
@@ -25,8 +24,9 @@ body.SourceLinesPage {
}
#project-contribs .overall .no-data {
text-align: center;
- font-size: 36px;
- font-style: italic;
+ font-size: 24px;
+ margin-top: 20px;
+ font-weight: bold;
}
#project-contribs .top-contributors .loading {
text-align: center;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
index bf7117fef9..22f116fa34 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js
@@ -16,7 +16,7 @@ onedev.server.stats = {
onDomReady : function(overallContributions, topContributorsDataUrl, userDetailCallback) {
var $contribs = $("#project-contribs");
var $overall = $contribs.find(".overall");
- if (overallContributions.length == 0) {
+ if (Object.keys(overallContributions).length === 0) {
$overall.html("<div class='no-data'>No data</div>");
return;
}
@@ -382,9 +382,14 @@ onedev.server.stats = {
var chart = echarts.init($chart[0]);
var useKilo;
+ var title;
+ if (defaultBranch != null)
+ title = "SLOC on " + defaultBranch;
+ else
+ title = "No default branch";
var option = {
title: {
- text: 'SLOC on ' + defaultBranch,
+ text: title,
left: 'center',
top: 10
},
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
index 30bc80f659..8b1536bee0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java
@@ -228,6 +228,10 @@ public class ProjectTagsPage extends ProjectPage {
form.error("Tag name is required.");
target.focusComponent(nameInput);
target.add(form);
+ } else if (tagRevision == null) {
+ form.error("Create from is required.");
+ target.focusComponent(nameInput);
+ target.add(form);
} else if (!Repository.isValidRefName(Constants.R_HEADS + tagName)) {
form.error("Invalid tag name.");
target.focusComponent(nameInput);