Skip to content

The Unified and Autonomous Development Platform

Suggest reviewer based on modified files and file modification history

robin shenf2175e17b602
diff --git a/core/pom.xml b/core/pom.xml
index 4430b9baa5..448c5c83e0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -293,7 +293,7 @@
<moduleClass>com.gitplex.server.CoreModule</moduleClass>
<hibernate.version>5.1.0.Final</hibernate.version>
<shiro.version>1.2.2</shiro.version>
- <jgit.version>4.4.1.201607150455-r</jgit.version>
+ <jgit.version>4.7.0.201704051617-r</jgit.version>
<flexmark.version>0.18.3</flexmark.version>
</properties>
</project>
\ No newline at end of file
diff --git a/core/src/main/java/com/gitplex/server/git/Blame.java b/core/src/main/java/com/gitplex/server/git/Blame.java
index 7a8b82d6f6..d4a421c1c4 100644
--- a/core/src/main/java/com/gitplex/server/git/Blame.java
+++ b/core/src/main/java/com/gitplex/server/git/Blame.java
@@ -8,16 +8,16 @@ import com.gitplex.jsymbol.Range;
public class Blame {
- private final BriefCommit commit;
+ private final Commit commit;
private final List<Range> ranges;
- public Blame(BriefCommit commit, List<Range> ranges) {
+ public Blame(Commit commit, List<Range> ranges) {
this.commit = commit;
this.ranges = ranges;
}
- public BriefCommit getCommit() {
+ public Commit getCommit() {
return commit;
}
diff --git a/core/src/main/java/com/gitplex/server/git/BlobEdits.java b/core/src/main/java/com/gitplex/server/git/BlobEdits.java
index ea7f9c06ec..2fb13672cc 100644
--- a/core/src/main/java/com/gitplex/server/git/BlobEdits.java
+++ b/core/src/main/java/com/gitplex/server/git/BlobEdits.java
@@ -3,7 +3,6 @@ package com.gitplex.server.git;
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -155,7 +154,8 @@ public class BlobEdits implements Serializable {
}
if (!entries.isEmpty()) {
TreeFormatter formatter = new TreeFormatter();
- Collections.sort(entries);
+ // Do not sort entries as otherwise it may distort original tree
+// Collections.sort(entries);
for (TreeFormatterEntry entry: entries)
formatter.append(entry.name, entry.mode, entry.id);
return inserter.insert(formatter);
diff --git a/core/src/main/java/com/gitplex/server/git/BriefCommit.java b/core/src/main/java/com/gitplex/server/git/BriefCommit.java
deleted file mode 100644
index 8e42e364b0..0000000000
--- a/core/src/main/java/com/gitplex/server/git/BriefCommit.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.gitplex.server.git;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import org.eclipse.jgit.lib.PersonIdent;
-
-import com.google.common.base.Objects;
-
-public class BriefCommit implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String hash;
-
- private final String subject;
-
- private final PersonIdent committer;
-
- private final PersonIdent author;
-
- public BriefCommit(String hash, PersonIdent committer, PersonIdent author, String subject) {
- this.hash = checkNotNull(hash, "hash");
- this.committer = checkNotNull(committer, "committer");
- this.author = checkNotNull(author, "author");
- this.subject = checkNotNull(subject, "subject");
- }
-
- public BriefCommit(BriefCommit commit) {
- this(commit.getHash(), commit.getCommitter(), commit.getAuthor(), commit.getSubject());
- }
-
- public String getHash() {
- return hash;
- }
-
- public PersonIdent getCommitter() {
- return committer;
- }
-
- public PersonIdent getAuthor() {
- return author;
- }
-
- public String getSubject() {
- return subject;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(hash);
- }
-
- @Override
- public boolean equals(Object other) {
- if (this == other) return true;
- if (!(other instanceof BriefCommit)) return false;
-
- BriefCommit rhs = (BriefCommit) other;
- return Objects.equal(hash, rhs.hash);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper(this)
- .add("hash", hash)
- .add("committer", committer.getName())
- .add("date", committer.getWhen())
- .add("messageSummary", subject)
- .toString();
- }
-
- public static class Builder {
-
- public String hash;
-
- public String committerName;
-
- public String committerEmail;
-
- public Date committerDate;
-
- public String authorName;
-
- public Date authorDate;
-
- public String authorEmail;
-
- public String subject;
-
- public BriefCommit build() {
- PersonIdent committer = GitUtils.newPersonIdent(committerName, committerEmail, committerDate);
- PersonIdent author = GitUtils.newPersonIdent(authorName, authorEmail, authorDate);
- return new BriefCommit(hash, committer, author, subject.trim());
- }
- }
-}
diff --git a/core/src/main/java/com/gitplex/server/git/Commit.java b/core/src/main/java/com/gitplex/server/git/Commit.java
index 9c28a077f3..b24bd1330c 100644
--- a/core/src/main/java/com/gitplex/server/git/Commit.java
+++ b/core/src/main/java/com/gitplex/server/git/Commit.java
@@ -2,93 +2,98 @@ package com.gitplex.server.git;
import static com.google.common.base.Preconditions.checkNotNull;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.io.Serializable;
+import java.util.Date;
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.PersonIdent;
-public class Commit extends BriefCommit {
+import com.google.common.base.Objects;
+
+public class Commit implements Serializable {
private static final long serialVersionUID = 1L;
- private final String body;
+ private final String hash;
- private final String note;
+ private final String subject;
- private final List<String> parentHashes;
+ private final PersonIdent committer;
- private final List<String> changedFiles;
-
- public Commit(String hash, PersonIdent committer, PersonIdent author, String subject,
- @Nullable String body, List<String> parentHashes, @Nullable String note,
- @Nullable List<String> changedFiles) {
- super(hash, committer, author, subject);
-
- this.body = body;
- this.parentHashes = new ArrayList<>(checkNotNull(parentHashes, "parentHashes"));
- this.note = note;
- this.changedFiles = changedFiles;
- }
+ private final PersonIdent author;
- public Commit(BriefCommit briefCommit, @Nullable String body,
- List<String> parentHashes, @Nullable String note,
- @Nullable List<String> changedFiles) {
- super(briefCommit);
-
- this.body = body;
- this.parentHashes = new ArrayList<>(checkNotNull(parentHashes, "parentHashes"));
- this.note = note;
- this.changedFiles = changedFiles;
+ public Commit(String hash, PersonIdent committer, PersonIdent author, String subject) {
+ this.hash = checkNotNull(hash, "hash");
+ this.committer = checkNotNull(committer, "committer");
+ this.author = checkNotNull(author, "author");
+ this.subject = checkNotNull(subject, "subject");
}
-
- public String getMessage() {
- if (body != null)
- return getSubject() + "\n\n" + body;
- else
- return getSubject();
+
+ public Commit(Commit commit) {
+ this(commit.getHash(), commit.getCommitter(), commit.getAuthor(), commit.getSubject());
+ }
+
+ public String getHash() {
+ return hash;
}
- @Nullable
- public String getNote() {
- return note;
+ public PersonIdent getCommitter() {
+ return committer;
}
- public List<String> getParentHashes() {
- return Collections.unmodifiableList(parentHashes);
+ public PersonIdent getAuthor() {
+ return author;
}
-
- @Nullable
- public String getBody() {
- return body;
+
+ public String getSubject() {
+ return subject;
}
- @Nullable
- public List<String> getChangedFiles() {
- return changedFiles;
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(hash);
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (this == other) return true;
+ if (!(other instanceof Commit)) return false;
+
+ Commit rhs = (Commit) other;
+ return Objects.equal(hash, rhs.hash);
+ }
+
+ @Override
+ public String toString() {
+ return Objects.toStringHelper(this)
+ .add("hash", hash)
+ .add("committer", committer.getName())
+ .add("date", committer.getWhen())
+ .add("messageSummary", subject)
+ .toString();
}
- public static class Builder extends BriefCommit.Builder {
+ public static class Builder {
- public String body;
+ public String hash;
- public List<String> parentHashes = new ArrayList<>();
+ public String committerName;
+
+ public String committerEmail;
- public String note;
+ public Date committerDate;
- public List<String> changedFiles;
+ public String authorName;
+
+ public Date authorDate;
+
+ public String authorEmail;
+
+ public String subject;
public Commit build() {
- return new Commit(super.build(), StringUtils.isNotBlank(body)?body.trim():null,
- parentHashes, note, changedFiles);
+ PersonIdent committer = GitUtils.newPersonIdent(committerName, committerEmail, committerDate);
+ PersonIdent author = GitUtils.newPersonIdent(authorName, authorEmail, authorDate);
+ return new Commit(hash, committer, author, subject.trim());
}
- }
-
- public static Builder builder() {
- return new Builder();
}
-
}
diff --git a/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java b/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java
index 27cf7a9a97..6d222dd546 100644
--- a/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java
+++ b/core/src/main/java/com/gitplex/server/git/command/BlameCommand.java
@@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
import com.gitplex.jsymbol.Range;
import com.gitplex.server.git.Blame;
-import com.gitplex.server.git.BriefCommit;
+import com.gitplex.server.git.Commit;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.util.execution.Commandline;
import com.gitplex.server.util.execution.ExecuteResult;
@@ -71,9 +71,9 @@ public class BlameCommand extends GitCommand<Map<String, Blame>> {
Commandline cmd = buildCmd();
final Map<String, Blame> blames = new HashMap<>();
- final Map<String, BriefCommit> commitMap = new HashMap<>();
+ final Map<String, Commit> commitMap = new HashMap<>();
- final AtomicReference<BriefCommit> commitRef = new AtomicReference<>(null);
+ final AtomicReference<Commit> commitRef = new AtomicReference<>(null);
final BriefCommitBuilder commitBuilder = new BriefCommitBuilder();
final AtomicBoolean endOfFile = new AtomicBoolean(false);
@@ -93,7 +93,7 @@ public class BlameCommand extends GitCommand<Map<String, Blame>> {
commitBuilder.hash = null;
} else if (commitBuilder.hash == null) {
commitBuilder.hash = StringUtils.substringBefore(line, " ");
- BriefCommit commit = commitRef.get();
+ Commit commit = commitRef.get();
if (commit != null && !commitBuilder.hash.equals(commit.getHash())) {
Blame blame = blames.get(commit.getHash());
if (blame == null) {
@@ -142,7 +142,7 @@ public class BlameCommand extends GitCommand<Map<String, Blame>> {
result.checkReturnCode();
if (endLine.get() > beginLine.get()) {
- BriefCommit commit = commitRef.get();
+ Commit commit = commitRef.get();
Blame blame = blames.get(commit.getHash());
if (blame == null) {
blame = new Blame(commit, new ArrayList<Range>());
@@ -175,8 +175,8 @@ public class BlameCommand extends GitCommand<Map<String, Blame>> {
private String summary;
- private BriefCommit build() {
- return new BriefCommit(
+ private Commit build() {
+ return new Commit(
hash,
GitUtils.newPersonIdent(committer, committerEmail, committerDate),
GitUtils.newPersonIdent(author, authorEmail, authorDate),
diff --git a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java
index a67c213fc6..2f0da366e1 100644
--- a/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/CommitInfoManager.java
@@ -2,18 +2,22 @@ package com.gitplex.server.manager;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.Future;
import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.git.NameAndEmail;
+import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
public interface CommitInfoManager {
- void collect(Depot depot);
+ Future<?> requestToCollect(Depot depot);
List<String> getFiles(Depot depot);
+ int getContributions(Depot depot, Account user, String path);
+
int getCommitCount(Depot depot);
List<NameAndEmail> getAuthors(Depot depot);
diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
index dc68141fbb..2089fe280a 100644
--- a/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/PullRequestManager.java
@@ -33,7 +33,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
void reopen(PullRequest request, @Nullable String note);
- void checkStatus(PullRequest request);
+ void check(PullRequest request);
/**
* Preview merge of this pull request.
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java
index e1889ed0f4..70944bf10e 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAccountManager.java
@@ -82,6 +82,11 @@ public class DefaultAccountManager extends AbstractEntityManager<Account> implem
});
}
+ @Override
+ public void save(Account account) {
+ save(account, null);
+ }
+
@Sessional
@Override
public Account getRoot() {
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java
index bf8a1585f7..1df274858f 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java
@@ -36,6 +36,7 @@ import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.support.CompareContext;
import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.persistence.annotation.Transactional;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.util.BatchWorker;
@@ -85,9 +86,8 @@ public class DefaultCodeCommentInfoManager implements CodeCommentInfoManager {
private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();
@Inject
- public DefaultCodeCommentInfoManager(Dao dao, DepotManager depotManager,
- StorageManager storageManager, CodeCommentManager codeCommentManager,
- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork) {
+ public DefaultCodeCommentInfoManager(Dao dao, DepotManager depotManager, StorageManager storageManager,
+ CodeCommentManager codeCommentManager, BatchWorkManager batchWorkManager, UnitOfWork unitOfWork) {
this.dao = dao;
this.depotManager = depotManager;
this.storageManager = storageManager;
@@ -172,9 +172,10 @@ public class DefaultCodeCommentInfoManager implements CodeCommentInfoManager {
return null;
}
+ @Sessional
@Override
public void collect(Depot depot) {
- logger.debug("Collecting code comment info (depot: {})", depot);
+ logger.debug("Collecting code comment info (depot: {})...", depot);
Environment env = getEnv(depot);
Store store = getStore(env, DEFAULT_STORE);
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
index 2e5fd3e249..bdfa2e4ca2 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCommitInfoManager.java
@@ -3,6 +3,7 @@ package com.gitplex.server.manager.impl;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
+import java.nio.ByteBuffer;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
@@ -17,6 +18,7 @@ import java.util.Set;
import java.util.Stack;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -30,6 +32,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,12 +46,16 @@ import com.gitplex.server.manager.BatchWorkManager;
import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.manager.DepotManager;
import com.gitplex.server.manager.StorageManager;
+import com.gitplex.server.manager.WorkExecutor;
+import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.persistence.UnitOfWork;
import com.gitplex.server.util.BatchWorker;
import com.gitplex.server.util.FileUtils;
import com.gitplex.server.util.StringUtils;
import com.gitplex.server.util.concurrent.Prioritized;
+import com.gitplex.server.util.concurrent.PrioritizedRunnable;
+import com.google.common.base.Charsets;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
@@ -72,6 +79,8 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
private static final String COMMITS_STORE = "commits";
+ private static final String CONTRIBUTIONS_STORE = "contributions";
+
private static final ByteIterable LAST_COMMIT_KEY = new StringByteIterable("lastCommit");
private static final ByteIterable AUTHORS_KEY = new StringByteIterable("authors");
@@ -86,6 +95,8 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
private final StorageManager storageManager;
+ private final WorkExecutor workExecutor;
+
private final BatchWorkManager batchWorkManager;
private final DepotManager depotManager;
@@ -104,11 +115,12 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
@Inject
public DefaultCommitInfoManager(DepotManager depotManager, StorageManager storageManager,
- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork) {
+ BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, WorkExecutor workExecutor) {
this.depotManager = depotManager;
this.storageManager = storageManager;
this.batchWorkManager = batchWorkManager;
this.unitOfWork = unitOfWork;
+ this.workExecutor = workExecutor;
}
private void doCollect(Depot depot, List<RevCommit> commits) {
@@ -117,6 +129,7 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
Environment env = getEnv(depot);
Store defaultStore = getStore(env, DEFAULT_STORE);
Store commitsStore = getStore(env, COMMITS_STORE);
+ Store contributionsStore = getStore(env, CONTRIBUTIONS_STORE);
commits.sort(Comparator.comparing(RevCommit::getCommitTime));
@@ -164,19 +177,14 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
prevFiles = new HashSet<>();
Set<String> files = new HashSet<>(prevFiles);
- RevCommit latestCommit = commits.get(commits.size()-1);
- try ( RevWalk revWalk = new RevWalk(depot.getRepository());
- TreeWalk treeWalk = new TreeWalk(depot.getRepository());) {
+ try ( RevWalk revWalk = new RevWalk(depot.getRepository());) {
revWalk.markStart(commits);
if (lastCommitId != null) {
RevCommit lastCommit = GitUtils.parseCommit(revWalk, lastCommitId);
if (lastCommit != null) {
revWalk.markUninteresting(lastCommit);
- treeWalk.addTree(lastCommit.getTree());
}
}
- treeWalk.addTree(latestCommit.getTree());
- treeWalk.setRecursive(true);
RevCommit commit = revWalk.next();
while (commit != null) {
@@ -228,14 +236,31 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
|| StringUtils.isNotBlank(commit.getCommitterIdent().getEmailAddress())) {
committers.add(new NameAndEmail(commit.getCommitterIdent()));
}
+
+ String authorEmail = commit.getAuthorIdent().getEmailAddress();
+ if (StringUtils.isNotBlank(authorEmail) && commit.getParentCount() == 1) {
+ try (TreeWalk treeWalk = new TreeWalk(depot.getRepository())) {
+ treeWalk.setFilter(TreeFilter.ANY_DIFF);
+ treeWalk.addTree(commit.getTree());
+ treeWalk.addTree(commit.getParent(0).getTree());
+ treeWalk.setRecursive(true);
+ while (treeWalk.next()) {
+ String path = treeWalk.getPathString();
+ files.add(path);
+
+ updateContribution(txn, contributionsStore, authorEmail, path);
+ while (path.contains("/")) {
+ path = StringUtils.substringBeforeLast(path, "/");
+ updateContribution(txn, contributionsStore, authorEmail, path);
+ }
+ updateContribution(txn, contributionsStore, authorEmail, "");
+ }
+ }
+ }
}
commit = revWalk.next();
}
- while (treeWalk.next()) {
- files.add(treeWalk.getPathString());
- }
-
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -265,12 +290,28 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
}
bytes = new byte[20];
- latestCommit.copyRawTo(bytes, 0);
+ commits.get(commits.size()-1).copyRawTo(bytes, 0);
defaultStore.put(txn, LAST_COMMIT_KEY, new ArrayByteIterable(bytes));
}
});
- logger.debug("Commits info collected (repository: {}, commits: {})...", depot, commits.size());
+ logger.debug("Commits info collected (repository: {}, commits: {})", depot, commits.size());
+ }
+
+ private void updateContribution(Transaction txn, Store contributionsStore, String email, String path) {
+ ArrayByteIterable contributionKey =
+ new ArrayByteIterable(getContributionKey(email, path));
+ byte[] contributionBytes =
+ getBytes(contributionsStore.get(txn, contributionKey));
+ int contributions;
+ if (contributionBytes != null)
+ contributions = ByteBuffer.wrap(contributionBytes).getInt() + 1;
+ else
+ contributions = 1;
+ ByteBuffer byteBuffer = ByteBuffer.allocate(4);
+ byteBuffer.putInt(contributions);
+ contributionsStore.put(txn, contributionKey,
+ new ArrayByteIterable(byteBuffer.array()));
}
private Environment getEnv(final Depot depot) {
@@ -387,6 +428,32 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
return files;
}
+ private byte[] getContributionKey(String email, String file) {
+ return (email + " " + file).getBytes(Charsets.UTF_8);
+ }
+
+ @Override
+ public int getContributions(Depot depot, Account account, String path) {
+ if (account.getEmail() != null) {
+ Environment env = getEnv(depot);
+ Store store = getStore(env, CONTRIBUTIONS_STORE);
+ return env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {
+
+ @Override
+ public Integer compute(Transaction tx) {
+ byte[] contributionKey = getContributionKey(account.getEmail(), path);
+ byte[] bytes = getBytes(store.get(tx, new ArrayByteIterable(contributionKey)));
+ if (bytes != null)
+ return ByteBuffer.wrap(bytes).getInt();
+ else
+ return 0;
+ }
+ });
+ } else {
+ return 0;
+ }
+ }
+
@Override
public Set<ObjectId> getDescendants(Depot depot, final ObjectId ancestor) {
Environment env = getEnv(depot);
@@ -523,42 +590,49 @@ public class DefaultCommitInfoManager implements CommitInfoManager {
}
@Override
- public void collect(Depot depot) {
- List<RevCommit> commits = new ArrayList<>();
- try (RevWalk revWalk = new RevWalk(depot.getRepository())) {
- Collection<Ref> refs = new ArrayList<>();
- refs.addAll(depot.getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values());
- refs.addAll(depot.getRepository().getRefDatabase().getRefs(Constants.R_TAGS).values());
-
- for (Ref ref: refs) {
- RevObject revObj = revWalk.peel(revWalk.parseAny(ref.getObjectId()));
- if (revObj instanceof RevCommit) {
- RevCommit commit = (RevCommit) revObj;
- Environment env = getEnv(depot);
- Store commitsStore = getStore(env, COMMITS_STORE);
- boolean collected = env.computeInReadonlyTransaction(new TransactionalComputable<Boolean>() {
-
- @Override
- public Boolean compute(Transaction txn) {
- byte[] keyBytes = new byte[20];
- commit.copyRawTo(keyBytes, 0);
- ByteIterable key = new ArrayByteIterable(keyBytes);
- byte[] valueBytes = getBytes(commitsStore.get(txn, key));
- return valueBytes != null && valueBytes.length%2 != 0;
+ public Future<?> requestToCollect(Depot depot) {
+ return workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
+
+ @Override
+ public void run() {
+ List<RevCommit> commits = new ArrayList<>();
+ try (RevWalk revWalk = new RevWalk(depot.getRepository())) {
+ Collection<Ref> refs = new ArrayList<>();
+ refs.addAll(depot.getRepository().getRefDatabase().getRefs(Constants.R_HEADS).values());
+ refs.addAll(depot.getRepository().getRefDatabase().getRefs(Constants.R_TAGS).values());
+
+ for (Ref ref: refs) {
+ RevObject revObj = revWalk.peel(revWalk.parseAny(ref.getObjectId()));
+ if (revObj instanceof RevCommit) {
+ RevCommit commit = (RevCommit) revObj;
+ Environment env = getEnv(depot);
+ Store commitsStore = getStore(env, COMMITS_STORE);
+ boolean collected = env.computeInReadonlyTransaction(new TransactionalComputable<Boolean>() {
+
+ @Override
+ public Boolean compute(Transaction txn) {
+ byte[] keyBytes = new byte[20];
+ commit.copyRawTo(keyBytes, 0);
+ ByteIterable key = new ArrayByteIterable(keyBytes);
+ byte[] valueBytes = getBytes(commitsStore.get(txn, key));
+ return valueBytes != null && valueBytes.length%2 != 0;
+ }
+
+ });
+ if (!collected)
+ commits.add(commit);
}
-
- });
- if (!collected)
- commits.add(commit);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ if (!commits.isEmpty()) {
+ doCollect(depot, commits);
}
}
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- if (!commits.isEmpty()) {
- doCollect(depot, commits);
- }
+
+ });
}
@Listen
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
index b11edb6d7c..126af59b4b 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
@@ -7,6 +7,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Collectors;
@@ -136,6 +137,11 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
return repository;
}
+ @Override
+ public void save(Depot depot) {
+ save(depot, null, null);
+ }
+
@Transactional
@Override
public void save(Depot depot, Long oldAccountId, String oldName) {
@@ -177,6 +183,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
}
if (isNew) {
checkGit(depot);
+ commitInfoManager.requestToCollect(depot);
}
}
@@ -250,15 +257,13 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
@Transactional
@Override
public void fork(Depot from, Depot to) {
- boolean isNew = to.isNew();
save(to);
FileUtils.cleanDir(to.getDirectory());
new CloneCommand(to.getDirectory()).mirror(true).from(from.getDirectory().getAbsolutePath()).call();
- doAfterCommit(newAfterCommitRunnable(to, isNew));
+ doAfterCommit(newAfterCommitRunnable(to, true));
}
private void checkGit(Depot depot) {
- logger.info("Checking sanity of repository '{}'...", depot);
File gitDir = depot.getDirectory();
if (depot.getDirectory().exists() && !GitUtils.isValid(gitDir)) {
logger.warn("Directory '" + gitDir + "' is not a valid git repository, removing...");
@@ -299,11 +304,17 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
@Listen
public void on(SystemStarted event) {
for (Depot depot: findAll()) {
+ logger.info("Checking repository {}...", depot.getFQN());
checkGit(depot);
checkInfo(depot);
- commitInfoManager.collect(depot);
+ try {
+ commitInfoManager.requestToCollect(depot).get();
+ } catch (InterruptedException | ExecutionException e) {
+ throw new RuntimeException(e);
+ }
pullRequestInfoManager.collect(depot);
codeCommentInfoManager.collect(depot);
+ logger.info("Repository checking finished for {}", depot.getFQN());
}
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java
index 50027037bb..27fda48b0b 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java
@@ -35,6 +35,7 @@ import com.gitplex.server.manager.StorageManager;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequestUpdate;
import com.gitplex.server.persistence.UnitOfWork;
+import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.persistence.annotation.Transactional;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.persistence.dao.EntityPersisted;
@@ -166,7 +167,8 @@ public class DefaultPullRequestInfoManager implements PullRequestInfoManager {
else
return null;
}
-
+
+ @Sessional
@Override
public void collect(Depot depot) {
logger.debug("Collecting pull request info (repository: {})...", depot);
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index 8c3a472389..facf6594b2 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -201,7 +201,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
request.setLastEvent(statusChange);
save(request);
- checkStatusAsync(request);
+ checkAsync(request);
}
@Transactional
@@ -350,7 +350,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
for (ReviewInvitation invitation: request.getReviewInvitations())
reviewInvitationManager.save(invitation);
- checkStatusAsync(request);
+ checkAsync(request);
listenerRegistry.post(new PullRequestOpened(request));
}
@@ -403,7 +403,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Transactional
@Override
- public void checkStatus(PullRequest request) {
+ public void check(PullRequest request) {
if (request.isOpen()) {
if (request.getSourceDepot() == null) {
discard(request, "Source repository no longer exists");
@@ -564,7 +564,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
ofOpen(),
Restrictions.or(ofSource(depotAndBranch), ofTarget(depotAndBranch)));
for (PullRequest request: findAll(EntityCriteria.of(PullRequest.class).add(criterion))) {
- checkStatus(request);
+ check(request);
}
}
}
@@ -642,13 +642,13 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
Type type = event.getStatusChange().getType();
if (type == Type.APPROVED || type == Type.DISAPPROVED || type == Type.WITHDRAWED_REVIEW
|| type == Type.REMOVED_REVIEWER || type == Type.ADDED_REVIEWER) {
- checkStatusAsync(event.getRequest());
+ checkAsync(event.getRequest());
}
}
@Listen
public void on(MergePreviewCalculated event) {
- checkStatusAsync(event.getRequest());
+ checkAsync(event.getRequest());
}
private Runnable newCheckStatusRunnable(Long requestId, Subject subject) {
@@ -658,7 +658,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
public void run() {
try {
ThreadContext.bind(subject);
- checkStatus(load(requestId));
+ check(load(requestId));
} catch (Exception e) {
logger.error("Error checking pull request status", e);
} finally {
@@ -670,7 +670,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
@Sessional
- protected void checkStatusAsync(PullRequest request) {
+ protected void checkAsync(PullRequest request) {
Long requestId = request.getId();
Subject subject = SecurityUtils.getSubject();
if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
index 808c0e5da3..0d39c58506 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
@@ -16,6 +16,7 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.treewalk.TreeWalk;
@@ -25,7 +26,9 @@ import org.hibernate.criterion.Restrictions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.AccountManager;
+import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.manager.PullRequestReviewManager;
import com.gitplex.server.manager.PullRequestStatusChangeManager;
@@ -50,7 +53,6 @@ import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.security.privilege.DepotPrivilege;
import com.gitplex.server.util.ReviewStatus;
import com.gitplex.server.util.reviewappointment.ReviewAppointment;
-import com.google.common.base.Preconditions;
@Singleton
public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview>
@@ -58,6 +60,8 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestReviewManager.class);
+ private static final int MAX_CONTRIBUTION_FILES = 100;
+
private final AccountManager accountManager;
private final PullRequestManager pullRequestManager;
@@ -65,8 +69,8 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
@Inject
- public DefaultPullRequestReviewManager(Dao dao, AccountManager accountManager, PullRequestManager pullRequestManager,
- PullRequestStatusChangeManager pullRequestStatusChangeManager) {
+ public DefaultPullRequestReviewManager(Dao dao, AccountManager accountManager,
+ PullRequestManager pullRequestManager, PullRequestStatusChangeManager pullRequestStatusChangeManager) {
super(dao);
this.accountManager = accountManager;
@@ -273,7 +277,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
PullRequestReview effectiveReview = user.getReviewAfter(update);
if (effectiveReview == null) {
awaitingReviewers.add(user);
- recordReviewer(user);
+ inviteReviewer(user);
} else {
effectiveReviews.put(effectiveReview.getUser(), effectiveReview);
}
@@ -317,24 +321,37 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
}
int missingCount = requiredCount - effectiveCount;
+ Set<Account> reviewers = new HashSet<>();
- Set<Account> candidateReviewers = new HashSet<>();
+ List<Account> candidateReviewers = new ArrayList<>();
for (Account user: potentialReviewers) {
ReviewInvitation invitation = getInvitation(user);
if (invitation != null && invitation.getType() != ReviewInvitation.Type.EXCLUDE)
candidateReviewers.add(user);
}
- if (candidateReviewers.size() < missingCount) {
+
+ sortByContributions(candidateReviewers, update);
+ for (Account user: candidateReviewers) {
+ reviewers.add(user);
+ if (reviewers.size() == missingCount)
+ break;
+ }
+
+ if (reviewers.size() < missingCount) {
+ candidateReviewers = new ArrayList<>();
for (Account user: potentialReviewers) {
ReviewInvitation invitation = getInvitation(user);
- if (invitation == null) {
+ if (invitation == null)
candidateReviewers.add(user);
- if (candidateReviewers.size() == missingCount)
- break;
- }
+ }
+ sortByContributions(candidateReviewers, update);
+ for (Account user: candidateReviewers) {
+ reviewers.add(user);
+ if (reviewers.size() == missingCount)
+ break;
}
}
- if (candidateReviewers.size() < missingCount) {
+ if (reviewers.size() < missingCount) {
List<ReviewInvitation> excludedInvitations = new ArrayList<>();
for (Account user: potentialReviewers) {
ReviewInvitation invitation = getInvitation(user);
@@ -344,39 +361,63 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
excludedInvitations.sort(Comparator.comparing(ReviewInvitation::getDate));
for (ReviewInvitation invitation: excludedInvitations) {
- candidateReviewers.add(invitation.getUser());
- if (candidateReviewers.size() == missingCount)
+ reviewers.add(invitation.getUser());
+ if (reviewers.size() == missingCount)
break;
}
}
- if (candidateReviewers.size() < missingCount) {
+ if (reviewers.size() < missingCount) {
String errorMessage = String.format("Impossible to provide required number of reviewers "
+ "(candidates: %s, required number of reviewers: %d, pull request: #%d)",
- candidateReviewers, missingCount, update.getRequest().getNumber());
+ reviewers, missingCount, update.getRequest().getNumber());
throw new RuntimeException(errorMessage);
}
- Set<Account> selectedReviewers = selectReviewers(candidateReviewers, missingCount);
- for (Account user: selectedReviewers) {
+ for (Account user: reviewers) {
awaitingReviewers.add(user);
- recordReviewer(user);
+ inviteReviewer(user);
}
}
- private Set<Account> selectReviewers(Set<Account> candidateReviewers, int count) {
- Preconditions.checkArgument(candidateReviewers.size() >= count);
- Set<Account> selectedReviewers = new HashSet<>();
- if (count > 0) {
- for (Account user: candidateReviewers) {
- selectedReviewers.add(user);
- if (selectedReviewers.size() == count)
+ private void sortByContributions(List<Account> users, PullRequestUpdate update) {
+ CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);
+ Map<Account, Integer> contributions = new HashMap<>();
+ for (Account user: users)
+ contributions.put(user, 0);
+
+ int count = 0;
+ for (String file: update.getChangedFiles()) {
+ int addedContributions = addContributions(contributions, commitInfoManager, file, update);
+ while (addedContributions == 0) {
+ if (file.contains("/")) {
+ file = StringUtils.substringBeforeLast(file, "/");
+ addedContributions = addContributions(contributions, commitInfoManager, file, update);
+ } else {
+ addContributions(contributions, commitInfoManager, "", update);
break;
+ }
}
+ if (++count >= MAX_CONTRIBUTION_FILES)
+ break;
+ }
+
+ users.sort((user1, user2)-> contributions.get(user2) - contributions.get(user1));
+ }
+
+ private int addContributions(Map<Account, Integer> contributions, CommitInfoManager commitInfoManager,
+ String file, PullRequestUpdate update) {
+ int addedContributions = 0;
+ for (Map.Entry<Account, Integer> entry: contributions.entrySet()) {
+ Account user = entry.getKey();
+ int fileContribution = commitInfoManager.getContributions(update.getRequest().getTargetDepot(), user,
+ file);
+ entry.setValue(entry.getValue() + fileContribution);
+ addedContributions += fileContribution;
}
- return selectedReviewers;
+ return addedContributions;
}
- private void recordReviewer(Account user) {
+ private void inviteReviewer(Account user) {
ReviewInvitation invitation = getInvitation(user);
if (invitation != null) {
invitation.setType(ReviewInvitation.Type.RULE);
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java b/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java
index fb50481676..c08406a92b 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java
@@ -114,21 +114,21 @@ public class PullRequestUpdate extends AbstractEntity {
Repository repository = getRequest().getWorkDepot().getRepository();
try ( RevWalk revWalk = new RevWalk(repository);
TreeWalk treeWalk = new TreeWalk(repository)) {
- RevCommit mergeCommit = revWalk.parseCommit(ObjectId.fromString(getMergeBaseCommitHash()));
+ RevCommit mergeBaseCommit = revWalk.parseCommit(ObjectId.fromString(getMergeBaseCommitHash()));
RevCommit baseCommit = revWalk.parseCommit(ObjectId.fromString(getBaseCommitHash()));
RevCommit headCommit = revWalk.parseCommit(ObjectId.fromString(getHeadCommitHash()));
- revWalk.markStart(mergeCommit);
+ revWalk.markStart(mergeBaseCommit);
revWalk.markStart(baseCommit);
revWalk.setRevFilter(RevFilter.MERGE_BASE);
- RevCommit mergeBase = Preconditions.checkNotNull(revWalk.next());
+ RevCommit nextMergeBase = Preconditions.checkNotNull(revWalk.next());
treeWalk.setRecursive(true);
- if (mergeBase.equals(baseCommit)) {
- treeWalk.addTree(mergeCommit.getTree());
+ if (nextMergeBase.equals(baseCommit)) {
+ treeWalk.addTree(mergeBaseCommit.getTree());
treeWalk.addTree(headCommit.getTree());
treeWalk.setFilter(TreeFilter.ANY_DIFF);
while (treeWalk.next())
changedFiles.add(treeWalk.getPathString());
- } else if (mergeBase.equals(mergeCommit)) {
+ } else if (nextMergeBase.equals(mergeBaseCommit)) {
treeWalk.addTree(baseCommit.getTree());
treeWalk.addTree(headCommit.getTree());
treeWalk.setFilter(TreeFilter.ANY_DIFF);
@@ -137,7 +137,7 @@ public class PullRequestUpdate extends AbstractEntity {
} else {
treeWalk.addTree(headCommit.getTree());
treeWalk.addTree(baseCommit.getTree());
- treeWalk.addTree(mergeCommit.getTree());
+ treeWalk.addTree(mergeBaseCommit.getTree());
treeWalk.setFilter(new TreeFilter() {
@Override
diff --git a/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java b/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java
index f57bc618f9..80675d1bf5 100644
--- a/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java
+++ b/core/src/main/java/com/gitplex/server/persistence/dao/EntityManager.java
@@ -91,6 +91,6 @@ public interface EntityManager<T extends AbstractEntity> {
* @return
* number of entities matching specified {@link DetachedCriteria}
*/
- int count(EntityCriteria<T> detachedCriteria);
+ int count(EntityCriteria<T> entityCriteria);
}
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java
index 843c2afa2f..4923d0f741 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/AbstractRevQueue.java
@@ -107,6 +107,7 @@ abstract class AbstractRevQueue extends Generator {
*
* @return the first commit of this queue.
*/
+ @Override
public abstract RevCommit next();
/** Remove all entries from this queue. */
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java
index 30d140a748..db5379e507 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/BlockRevQueue.java
@@ -83,6 +83,7 @@ abstract class BlockRevQueue extends AbstractRevQueue {
* @param q
* the other queue we will steal entries from.
*/
+ @Override
public void shareFreeList(final BlockRevQueue q) {
free = q.free;
}
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java
index 0802bfafde..cd7c074cce 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/DateRevQueue.java
@@ -82,6 +82,7 @@ public class DateRevQueue extends AbstractRevQueue {
}
}
+ @Override
public void add(final RevCommit c) {
sinceLastIndex++;
if (++inQueue > REBUILD_INDEX_COUNT
@@ -126,6 +127,7 @@ public class DateRevQueue extends AbstractRevQueue {
}
}
+ @Override
public RevCommit next() {
final Entry q = head;
if (q == null)
@@ -161,6 +163,7 @@ public class DateRevQueue extends AbstractRevQueue {
return head != null ? head.commit : null;
}
+ @Override
public void clear() {
head = null;
free = null;
@@ -170,6 +173,7 @@ public class DateRevQueue extends AbstractRevQueue {
last = -1;
}
+ @Override
boolean everbodyHasFlag(final int f) {
for (Entry q = head; q != null; q = q.next) {
if ((q.commit.flags & f) == 0)
@@ -178,6 +182,7 @@ public class DateRevQueue extends AbstractRevQueue {
return true;
}
+ @Override
boolean anybodyHasFlag(final int f) {
for (Entry q = head; q != null; q = q.next) {
if ((q.commit.flags & f) != 0)
@@ -191,6 +196,7 @@ public class DateRevQueue extends AbstractRevQueue {
return outputType | SORT_COMMIT_TIME_DESC;
}
+ @Override
public String toString() {
final StringBuilder s = new StringBuilder();
for (Entry q = head; q != null; q = q.next)
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java b/core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java
index 89d05dba59..f932593e82 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/DepthWalk.java
@@ -138,17 +138,31 @@ public interface DepthWalk {
return new Commit(id);
}
+ @Override
public int getDepth() {
return depth;
}
+ @Override
public RevFlag getUnshallowFlag() {
return UNSHALLOW;
}
+ @Override
public RevFlag getReinterestingFlag() {
return REINTERESTING;
}
+
+ /**
+ * @since 4.5
+ */
+ @Override
+ public ObjectWalk toObjectWalkWithSameObjects() {
+ ObjectWalk ow = new ObjectWalk(reader, depth);
+ ow.objects = objects;
+ ow.freeFlags = freeFlags;
+ return ow;
+ }
}
/** Subclass of ObjectWalk that performs depth filtering. */
@@ -228,14 +242,17 @@ public interface DepthWalk {
return new Commit(id);
}
+ @Override
public int getDepth() {
return depth;
}
+ @Override
public RevFlag getUnshallowFlag() {
return UNSHALLOW;
}
+ @Override
public RevFlag getReinterestingFlag() {
return REINTERESTING;
}
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java
index b8f63aaa58..14156042c8 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/FIFORevQueue.java
@@ -64,6 +64,7 @@ public class FIFORevQueue extends BlockRevQueue {
super(s);
}
+ @Override
public void add(final RevCommit c) {
Block b = tail;
if (b == null) {
@@ -107,6 +108,7 @@ public class FIFORevQueue extends BlockRevQueue {
head = b;
}
+ @Override
public RevCommit next() {
final Block b = head;
if (b == null)
@@ -122,12 +124,14 @@ public class FIFORevQueue extends BlockRevQueue {
return c;
}
+ @Override
public void clear() {
head = null;
tail = null;
free.clear();
}
+ @Override
boolean everbodyHasFlag(final int f) {
for (Block b = head; b != null; b = b.next) {
for (int i = b.headIndex; i < b.tailIndex; i++)
@@ -137,6 +141,7 @@ public class FIFORevQueue extends BlockRevQueue {
return true;
}
+ @Override
boolean anybodyHasFlag(final int f) {
for (Block b = head; b != null; b = b.next) {
for (int i = b.headIndex; i < b.tailIndex; i++)
@@ -154,6 +159,7 @@ public class FIFORevQueue extends BlockRevQueue {
}
}
+ @Override
public String toString() {
final StringBuilder s = new StringBuilder();
for (Block q = head; q != null; q = q.next) {
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java b/core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java
index 319b819a79..36965f4996 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/FooterKey.java
@@ -43,6 +43,8 @@
package org.eclipse.jgit.revwalk;
+import java.util.Locale;
+
import org.eclipse.jgit.lib.Constants;
/** Case insensitive key for a {@link FooterLine}. */
@@ -68,7 +70,7 @@ public final class FooterKey {
*/
public FooterKey(final String keyName) {
name = keyName;
- raw = Constants.encode(keyName.toLowerCase());
+ raw = Constants.encode(keyName.toLowerCase(Locale.ROOT));
}
/** @return name of this footer line. */
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java b/core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java
index 9abaf8dccf..f9da5b17ba 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/LIFORevQueue.java
@@ -63,6 +63,7 @@ public class LIFORevQueue extends BlockRevQueue {
super(s);
}
+ @Override
public void add(final RevCommit c) {
Block b = head;
if (b == null || !b.canUnpop()) {
@@ -74,6 +75,7 @@ public class LIFORevQueue extends BlockRevQueue {
b.unpop(c);
}
+ @Override
public RevCommit next() {
final Block b = head;
if (b == null)
@@ -87,11 +89,13 @@ public class LIFORevQueue extends BlockRevQueue {
return c;
}
+ @Override
public void clear() {
head = null;
free.clear();
}
+ @Override
boolean everbodyHasFlag(final int f) {
for (Block b = head; b != null; b = b.next) {
for (int i = b.headIndex; i < b.tailIndex; i++)
@@ -101,6 +105,7 @@ public class LIFORevQueue extends BlockRevQueue {
return true;
}
+ @Override
boolean anybodyHasFlag(final int f) {
for (Block b = head; b != null; b = b.next) {
for (int i = b.headIndex; i < b.tailIndex; i++)
@@ -110,6 +115,7 @@ public class LIFORevQueue extends BlockRevQueue {
return false;
}
+ @Override
public String toString() {
final StringBuilder s = new StringBuilder();
for (Block q = head; q != null; q = q.next) {
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java b/core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
index f1d7dc8361..5d7e72dd29 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/MergeBaseGenerator.java
@@ -45,6 +45,7 @@ package org.eclipse.jgit.revwalk;
import java.io.IOException;
import java.text.MessageFormat;
+import java.util.LinkedList;
import org.eclipse.jgit.errors.IncorrectObjectTypeException;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -85,12 +86,15 @@ class MergeBaseGenerator extends Generator {
private int recarryMask;
+ private int mergeBaseAncestor = -1;
+ private LinkedList<RevCommit> ret = new LinkedList<>();
+
MergeBaseGenerator(final RevWalk w) {
walker = w;
pending = new DateRevQueue();
}
- void init(final AbstractRevQueue p) {
+ void init(final AbstractRevQueue p) throws IOException {
try {
for (;;) {
final RevCommit c = p.next();
@@ -98,17 +102,25 @@ class MergeBaseGenerator extends Generator {
break;
add(c);
}
- } finally {
- // Always free the flags immediately. This ensures the flags
- // will be available for reuse when the walk resets.
- //
- walker.freeFlag(branchMask);
-
// Setup the condition used by carryOntoOne to detect a late
// merge base and produce it on the next round.
//
recarryTest = branchMask | POPPED;
recarryMask = branchMask | POPPED | MERGE_BASE;
+ mergeBaseAncestor = walker.allocFlag();
+
+ for (;;) {
+ RevCommit c = _next();
+ if (c == null) {
+ break;
+ }
+ ret.add(c);
+ }
+ } finally {
+ // Always free the flags immediately. This ensures the flags
+ // will be available for reuse when the walk resets.
+ //
+ walker.freeFlag(branchMask | mergeBaseAncestor);
}
}
@@ -131,8 +143,7 @@ class MergeBaseGenerator extends Generator {
return 0;
}
- @Override
- RevCommit next() throws MissingObjectException,
+ private RevCommit _next() throws MissingObjectException,
IncorrectObjectTypeException, IOException {
for (;;) {
final RevCommit c = pending.next();
@@ -156,7 +167,7 @@ class MergeBaseGenerator extends Generator {
// also flagged as being popped, so that they do not
// generate to the caller.
//
- carry |= MERGE_BASE;
+ carry |= MERGE_BASE | mergeBaseAncestor;
}
carryOntoHistory(c, carry);
@@ -179,6 +190,18 @@ class MergeBaseGenerator extends Generator {
}
}
+ @Override
+ RevCommit next() throws MissingObjectException,
+ IncorrectObjectTypeException, IOException {
+ while (!ret.isEmpty()) {
+ RevCommit commit = ret.remove();
+ if ((commit.flags & mergeBaseAncestor) == 0) {
+ return commit;
+ }
+ }
+ return null;
+ }
+
private void carryOntoHistory(RevCommit c, final int carry) {
for (;;) {
final RevCommit[] pList = c.parents;
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java b/core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java
index 9c3af5a5dc..58689981b5 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/ObjectWalk.java
@@ -133,7 +133,7 @@ public class ObjectWalk extends RevWalk {
public ObjectWalk(ObjectReader or) {
super(or);
setRetainBody(false);
- rootObjects = new ArrayList<RevObject>();
+ rootObjects = new ArrayList<>();
pendingObjects = new BlockObjQueue();
objectFilter = ObjectFilter.ALL;
pathBuf = new byte[256];
@@ -243,6 +243,7 @@ public class ObjectWalk extends RevWalk {
addObject(o);
}
+ @Override
public void sort(RevSort s) {
super.sort(s);
boundary = hasRevSort(RevSort.BOUNDARY);
@@ -681,7 +682,7 @@ public class ObjectWalk extends RevWalk {
for (RevObject obj : rootObjects)
obj.flags &= ~IN_PENDING;
- rootObjects = new ArrayList<RevObject>();
+ rootObjects = new ArrayList<>();
pendingObjects = new BlockObjQueue();
currVisit = null;
freeVisit = null;
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java
index e67ada6022..c641a13311 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/RevCommit.java
@@ -244,7 +244,7 @@ public class RevCommit extends RevObject {
if ((p.flags & carry) == carry)
continue;
p.flags |= carry;
- FIFORevQueue q = carryFlags1(c, carry, depth + 1);
+ FIFORevQueue q = carryFlags1(p, carry, depth + 1);
if (q != null)
return defer(q, carry, pList, i + 1);
}
@@ -565,7 +565,7 @@ public class RevCommit extends RevObject {
ptr--;
final int msgB = RawParseUtils.commitMessage(raw, 0);
- final ArrayList<FooterLine> r = new ArrayList<FooterLine>(4);
+ final ArrayList<FooterLine> r = new ArrayList<>(4);
final Charset enc = guessEncoding();
for (;;) {
ptr = RawParseUtils.prevLF(raw, ptr);
@@ -628,7 +628,7 @@ public class RevCommit extends RevObject {
final List<FooterLine> src = getFooterLines();
if (src.isEmpty())
return Collections.emptyList();
- final ArrayList<String> r = new ArrayList<String>(src.size());
+ final ArrayList<String> r = new ArrayList<>(src.size());
for (final FooterLine f : src) {
if (f.matches(keyName))
r.add(f.getValue());
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java
index 0998a3a221..dae52f85db 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/RevFlag.java
@@ -99,6 +99,7 @@ public class RevFlag {
return walker;
}
+ @Override
public String toString() {
return name;
}
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java
index ca30fd98d1..bb699e08c4 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/RevFlagSet.java
@@ -61,7 +61,7 @@ public class RevFlagSet extends AbstractSet<RevFlag> {
/** Create an empty set of flags. */
public RevFlagSet() {
- active = new ArrayList<RevFlag>();
+ active = new ArrayList<>();
}
/**
@@ -72,7 +72,7 @@ public class RevFlagSet extends AbstractSet<RevFlag> {
*/
public RevFlagSet(final RevFlagSet s) {
mask = s.mask;
- active = new ArrayList<RevFlag>(s.active);
+ active = new ArrayList<>(s.active);
}
/**
@@ -132,14 +132,17 @@ public class RevFlagSet extends AbstractSet<RevFlag> {
return new Iterator<RevFlag>() {
private RevFlag current;
+ @Override
public boolean hasNext() {
return i.hasNext();
}
+ @Override
public RevFlag next() {
return current = i.next();
}
+ @Override
public void remove() {
mask &= ~current.mask;
i.remove();
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java
index 5052a4dea5..95986782cd 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/RevObjectList.java
@@ -78,6 +78,7 @@ public class RevObjectList<E extends RevObject> extends AbstractList<E> {
// Initialized above.
}
+ @Override
public void add(final int index, final E element) {
if (index != size)
throw new UnsupportedOperationException(MessageFormat.format(
@@ -87,6 +88,7 @@ public class RevObjectList<E extends RevObject> extends AbstractList<E> {
size++;
}
+ @Override
@SuppressWarnings("unchecked")
public E set(int index, E element) {
Block s = contents;
@@ -107,6 +109,7 @@ public class RevObjectList<E extends RevObject> extends AbstractList<E> {
return (E) old;
}
+ @Override
@SuppressWarnings("unchecked")
public E get(int index) {
Block s = contents;
@@ -120,6 +123,7 @@ public class RevObjectList<E extends RevObject> extends AbstractList<E> {
return s != null ? (E) s.contents[index] : null;
}
+ @Override
public int size() {
return size;
}
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java
index c8504937a7..320f05f440 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/RevWalk.java
@@ -172,7 +172,7 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
ObjectIdOwnerMap<RevObject> objects;
- private int freeFlags = APP_FLAGS;
+ int freeFlags = APP_FLAGS;
private int delayFreeFlags;
@@ -226,8 +226,8 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
private RevWalk(ObjectReader or, boolean closeReader) {
reader = or;
idBuffer = new MutableObjectId();
- objects = new ObjectIdOwnerMap<RevObject>();
- roots = new ArrayList<RevCommit>();
+ objects = new ObjectIdOwnerMap<>();
+ roots = new ArrayList<>();
queue = new DateRevQueue();
pending = new StartGenerator(this);
sorting = EnumSet.of(RevSort.NONE);
@@ -931,8 +931,8 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
*/
public <T extends ObjectId> AsyncRevObjectQueue parseAny(
Iterable<T> objectIds, boolean reportMissing) {
- List<T> need = new ArrayList<T>();
- List<RevObject> have = new ArrayList<RevObject>();
+ List<T> need = new ArrayList<>();
+ List<RevObject> have = new ArrayList<>();
for (T id : objectIds) {
RevObject r = objects.get(id);
if (r != null && (r.flags & PARSED) != 0)
@@ -944,14 +944,17 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
final Iterator<RevObject> objItr = have.iterator();
if (need.isEmpty()) {
return new AsyncRevObjectQueue() {
+ @Override
public RevObject next() {
return objItr.hasNext() ? objItr.next() : null;
}
+ @Override
public boolean cancel(boolean mayInterruptIfRunning) {
return true;
}
+ @Override
public void release() {
// In-memory only, no action required.
}
@@ -960,6 +963,7 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
final AsyncObjectLoaderQueue<T> lItr = reader.open(need, reportMissing);
return new AsyncRevObjectQueue() {
+ @Override
public RevObject next() throws MissingObjectException,
IncorrectObjectTypeException, IOException {
if (objItr.hasNext())
@@ -983,10 +987,12 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
return r;
}
+ @Override
public boolean cancel(boolean mayInterruptIfRunning) {
return lItr.cancel(mayInterruptIfRunning);
}
+ @Override
public void release() {
lItr.release();
}
@@ -1316,6 +1322,7 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
* @return an iterator over this walker's commits.
* @see RevWalkException
*/
+ @Override
public Iterator<RevCommit> iterator() {
final RevCommit first;
try {
@@ -1331,10 +1338,12 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
return new Iterator<RevCommit>() {
RevCommit next = first;
+ @Override
public boolean hasNext() {
return next != null;
}
+ @Override
public RevCommit next() {
try {
final RevCommit r = next;
@@ -1349,6 +1358,7 @@ public class RevWalk implements Iterable<RevCommit>, AutoCloseable {
}
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java b/core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java
index 11fec31e91..e751d7714c 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/RevWalkUtils.java
@@ -121,7 +121,7 @@ public final class RevWalkUtils {
if (end != null)
walk.markUninteresting(end);
- List<RevCommit> commits = new ArrayList<RevCommit>();
+ List<RevCommit> commits = new ArrayList<>();
for (RevCommit c : walk)
commits.add(c);
return commits;
@@ -155,7 +155,7 @@ public final class RevWalkUtils {
// Make sure commit is from the same RevWalk
commit = revWalk.parseCommit(commit.getId());
revWalk.reset();
- List<Ref> result = new ArrayList<Ref>();
+ List<Ref> result = new ArrayList<>();
final int SKEW = 24*3600; // one day clock skew
diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java b/core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java
index 14a98a10bf..6b90d29f1c 100644
--- a/core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java
+++ b/core/src/main/java/org/eclipse/jgit/revwalk/filter/RevFilter.java
@@ -286,6 +286,7 @@ public abstract class RevFilter {
*
* @return another copy of this filter, suitable for another thread.
*/
+ @Override
public abstract RevFilter clone();
@Override
diff --git a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
index 96f4d86331..7e99597f16 100644
--- a/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
+++ b/search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
@@ -317,7 +317,7 @@ public class DefaultIndexManager implements IndexManager {
public Void call() throws Exception {
Depot depot = depotManager.load(depotId);
IndexWork indexWork = (IndexWork) works.iterator().next();
- index(depot, indexWork.getCommitId());
+ doIndex(depot, indexWork.getCommitId());
return null;
}
@@ -327,8 +327,7 @@ public class DefaultIndexManager implements IndexManager {
};
}
- @Override
- public IndexResult index(Depot depot, ObjectId commit) {
+ private IndexResult doIndex(Depot depot, ObjectId commit) {
IndexResult indexResult;
File indexDir = storageManager.getIndexDir(depot);
try (Directory directory = FSDirectory.open(indexDir)) {
diff --git a/search/src/main/java/com/gitplex/server/search/IndexManager.java b/search/src/main/java/com/gitplex/server/search/IndexManager.java
index cd4ab6920e..a718006e55 100644
--- a/search/src/main/java/com/gitplex/server/search/IndexManager.java
+++ b/search/src/main/java/com/gitplex/server/search/IndexManager.java
@@ -3,12 +3,9 @@ package com.gitplex.server.search;
import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.model.Depot;
-import com.gitplex.server.util.IndexResult;
public interface IndexManager {
- IndexResult index(Depot depot, ObjectId commit);
-
void indexAsync(Depot depot, ObjectId commit);
boolean isIndexed(Depot depot, ObjectId commit);
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java
index 7a0ae546cb..f3d05244b2 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteAccountModal.java
@@ -28,8 +28,7 @@ public abstract class ConfirmDeleteAccountModal extends ConfirmDeleteModal {
@Override
protected String getWarningMessage() {
- return "All pull requests submitted by and comments belonging to account \"" + getAccount().getName() + "\" will also be deleted, "
- + "please input account name below to confirm deletion.";
+ return "please input account name \"" + getAccount().getName() + "\" below to confirm deletion.";
}
protected abstract void onDeleted(AjaxRequestTarget target);
diff --git a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java
index e2adaceacc..c1ce34dc0e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java
+++ b/web/src/main/java/com/gitplex/server/web/component/confirmdelete/ConfirmDeleteDepotModal.java
@@ -28,7 +28,7 @@ public abstract class ConfirmDeleteDepotModal extends ConfirmDeleteModal {
@Override
protected String getWarningMessage() {
return "Everything inside this repository will be deleted and can not be recovered, "
- + "please input repository name below to confirm deletion.";
+ + "please input repository name \"" + getDepot().getName() + "\" below to confirm deletion.";
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
index d65cca7f52..2e040347c4 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -44,7 +44,7 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.git.Blame;
import com.gitplex.server.git.BlobChange;
import com.gitplex.server.git.BlobIdent;
-import com.gitplex.server.git.BriefCommit;
+import com.gitplex.server.git.Commit;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.git.command.BlameCommand;
import com.gitplex.server.manager.CodeCommentManager;
@@ -679,7 +679,7 @@ public class TextDiffPanel extends Panel implements SourceAware {
}
private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {
- BriefCommit commit;
+ Commit commit;
if (newLineNo != -1)
commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));
else
@@ -1182,9 +1182,9 @@ public class TextDiffPanel extends Panel implements SourceAware {
private static class BlameInfo implements Serializable {
- Map<Integer, BriefCommit> oldBlame = new HashMap<>();
+ Map<Integer, Commit> oldBlame = new HashMap<>();
- Map<Integer, BriefCommit> newBlame = new HashMap<>();
+ Map<Integer, Commit> newBlame = new HashMap<>();
String lastCommitHash;
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.html
index 222beb562c..c4d6367535 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.html
@@ -9,32 +9,19 @@
</div>
</div>
<div class="body">
- <table wicket:id="accounts" class="accounts table table-hover">
- <thead>
- <tr>
- <th class="name">Name</th>
- <th class="email">Email</th>
- <th class="actions"></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="accounts">
- <td class="name">
- <a wicket:id="avatarLink"></a>
- <a wicket:id="nameLink"></a>
- </td>
- <td class="email">
- <span wicket:id="email"></span>
- </td>
- <td class="actions">
- <a wicket:id="setting" class="fa fa-cog" title="User settings"></a>
- <a wicket:id="delete" class="fa fa-trash" title="Delete this user"></a>
- </td>
- </tr>
- </tbody>
- </table>
+ <table wicket:id="accounts" class="accounts table table-hover"></table>
<div class="center"><ul wicket:id="accountsPageNav"></ul></div>
<div wicket:id="noAccounts" class="alert alert-warning">No users found</div>
</div>
</section>
+ <wicket:fragment wicket:id="nameFrag">
+ <a wicket:id="avatarLink"></a>
+ <a wicket:id="nameLink"></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="actionFrag">
+ <div class="btn-group">
+ <a wicket:id="setting" class="btn btn-default"><i class="fa fa-cog"></i> Profile</a>
+ <a wicket:id="delete" class="btn btn-default"><i class="fa fa-trash"></i> Delete</a>
+ </div>
+ </wicket:fragment>
</wicket:extend>
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java
index b513851277..950bfcb7c7 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/account/UserListPage.java
@@ -1,23 +1,34 @@
package com.gitplex.server.web.page.admin.account;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.PageableListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.model.Account;
+import com.gitplex.server.persistence.dao.EntityCriteria;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.WebConstants;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
@@ -34,16 +45,24 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.ajax.Bootstra
@SuppressWarnings("serial")
public class UserListPage extends AdministrationPage {
- private PageableListView<Account> accountsView;
+ private DataTable<Account, Void> accountsTable;
private BootstrapPagingNavigator pagingNavigator;
- private WebMarkupContainer accountsContainer;
-
private WebMarkupContainer noAccountsContainer;
private String searchInput;
+ private EntityCriteria<Account> getCriteria() {
+ EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);
+ if (searchInput != null) {
+ criteria.add(Restrictions.or(
+ Restrictions.ilike("name", searchInput, MatchMode.ANYWHERE),
+ Restrictions.ilike("fullName", searchInput, MatchMode.ANYWHERE)));
+ }
+ return criteria;
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -55,7 +74,7 @@ public class UserListPage extends AdministrationPage {
@Override
protected void onTypingDone(AjaxRequestTarget target) {
searchInput = searchField.getInput();
- target.add(accountsContainer);
+ target.add(accountsTable);
target.add(pagingNavigator);
target.add(noAccountsContainer);
}
@@ -77,54 +96,49 @@ public class UserListPage extends AdministrationPage {
});
- accountsContainer = new WebMarkupContainer("accounts") {
+ List<IColumn<Account, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<Account, Void>(Model.of("Name")) {
@Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!accountsView.getModelObject().isEmpty());
+ public void populateItem(Item<ICellPopulator<Account>> cellItem, String componentId,
+ IModel<Account> rowModel) {
+ Account account = rowModel.getObject();
+ Fragment fragment = new Fragment(componentId, "nameFrag", UserListPage.this);
+ fragment.add(new AvatarLink("avatarLink", account));
+ fragment.add(new AccountLink("nameLink", account));
+ cellItem.add(fragment);
}
-
- };
- accountsContainer.setOutputMarkupPlaceholderTag(true);
- add(accountsContainer);
+ });
- accountsContainer.add(accountsView = new PageableListView<Account>("accounts", new LoadableDetachableModel<List<Account>>() {
+ columns.add(new AbstractColumn<Account, Void>(Model.of("Email")) {
@Override
- protected List<Account> load() {
- List<Account> accounts = new ArrayList<>();
- for (Account account: GitPlex.getInstance(AccountManager.class).findAll()) {
- if (account.matches(searchInput) && !account.isOrganization()) {
- accounts.add(account);
- }
- }
- accounts.sort((account1, account2) -> account1.getDisplayName().compareTo(account2.getDisplayName()));
- return accounts;
+ public void populateItem(Item<ICellPopulator<Account>> cellItem, String componentId,
+ IModel<Account> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getEmail()));
}
-
- }, WebConstants.DEFAULT_PAGE_SIZE) {
+ });
+
+ columns.add(new AbstractColumn<Account, Void>(Model.of("")) {
@Override
- protected void populateItem(ListItem<Account> item) {
- Account account = item.getModelObject();
-
- item.add(new AvatarLink("avatarLink", item.getModelObject()));
- item.add(new AccountLink("nameLink", item.getModelObject()));
- item.add(new Label("email", account.getEmail()));
-
- item.add(new Link<Void>("setting") {
+ public void populateItem(Item<ICellPopulator<Account>> cellItem, String componentId,
+ IModel<Account> rowModel) {
+ Account account = rowModel.getObject();
+ Fragment fragment = new Fragment(componentId, "actionFrag", UserListPage.this);
+ fragment.add(new Link<Void>("setting") {
@Override
public void onClick() {
- PageParameters params = AccountPage.paramsOf(item.getModelObject());
+ PageParameters params = AccountPage.paramsOf(rowModel.getObject());
setResponsePage(ProfileEditPage.class, params);
}
});
Long accountId = account.getId();
- item.add(new AjaxLink<Void>("delete") {
+ fragment.add(new AjaxLink<Void>("delete") {
@Override
public void onClick(AjaxRequestTarget target) {
@@ -136,7 +150,7 @@ public class UserListPage extends AdministrationPage {
@Override
protected void onDeleted(AjaxRequestTarget target) {
- target.add(accountsContainer);
+ target.add(accountsTable);
target.add(pagingNavigator);
target.add(noAccountsContainer);
}
@@ -149,25 +163,57 @@ public class UserListPage extends AdministrationPage {
}
}
+ });
+ cellItem.add(fragment);
+ }
+ });
+
+ SortableDataProvider<Account, Void> dataProvider = new SortableDataProvider<Account, Void>() {
+
+ @Override
+ public Iterator<? extends Account> iterator(long first, long count) {
+ EntityCriteria<Account> criteria = getCriteria();
+ criteria.addOrder(Order.asc("name"));
+ return GitPlex.getInstance(AccountManager.class).findRange(criteria, (int)first, (int)count).iterator();
+ }
+
+ @Override
+ public long size() {
+ return GitPlex.getInstance(AccountManager.class).count(getCriteria());
+ }
+
+ @Override
+ public IModel<Account> model(Account object) {
+ Long id = object.getId();
+ return new LoadableDetachableModel<Account>() {
+
@Override
- protected void onConfigure() {
- super.onConfigure();
-
- Account account = item.getModelObject();
- setVisible(SecurityUtils.canManage(account) && !account.equals(getLoginUser()));
+ protected Account load() {
+ return GitPlex.getInstance(AccountManager.class).load(id);
}
+
+ };
+ }
+ };
+
+ add(accountsTable = new DataTable<Account, Void>("accounts", columns, dataProvider,
+ WebConstants.DEFAULT_PAGE_SIZE) {
- });
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getItemCount() != 0);
}
-
+
});
-
- add(pagingNavigator = new BootstrapAjaxPagingNavigator("accountsPageNav", accountsView) {
+ accountsTable.setOutputMarkupPlaceholderTag(true);
+
+ add(pagingNavigator = new BootstrapAjaxPagingNavigator("accountsPageNav", accountsTable) {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(accountsView.getPageCount() > 1);
+ setVisible(accountsTable.getPageCount() > 1);
}
});
@@ -178,7 +224,7 @@ public class UserListPage extends AdministrationPage {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(accountsView.getModelObject().isEmpty());
+ setVisible(accountsTable.getItemCount() == 0);
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css b/web/src/main/java/com/gitplex/server/web/page/admin/administration.css
index 4c02f4d5f3..166910ad5d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/admin/administration.css
+++ b/web/src/main/java/com/gitplex/server/web/page/admin/administration.css
@@ -4,12 +4,6 @@
#administration.sidebar>table>tbody>tr>td.content {
padding: 20px;
}
-.account.list .email {
- width: 20%;
-}
-.account.list .actions {
- width: 10%;
-}
.auto-backup {
margin-bottom: 20px;
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java
index f92f02cf8f..82ea762267 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/DepotCommitsPage.java
@@ -180,6 +180,7 @@ public class DepotCommitsPage extends DepotPage {
}
}).get();
+
} catch (Exception e) {
if (e.getMessage() != null && e.getMessage().contains(GIT_ERROR_START)) {
queryForm.error(StringUtils.substringAfter(e.getMessage(), GIT_ERROR_START));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
index ef9c95cc81..7f656fdf04 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
@@ -74,7 +74,11 @@ public class QueryAssistBehavior extends ANTLRAssistBehavior {
case CommitQueryParser.COMMITTER:
Map<String, Range> suggestedInputs = new LinkedHashMap<>();
CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);
- List<NameAndEmail> contributors = commitInfoManager.getAuthors(depot);
+ List<NameAndEmail> contributors;
+ if (tokenType == CommitQueryParser.AUTHOR)
+ contributors = commitInfoManager.getAuthors(depot);
+ else
+ contributors = commitInfoManager.getCommitters(depot);
for (NameAndEmail contributor: contributors) {
String content;
if (StringUtils.isNotBlank(contributor.getEmailAddress()))
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
index fb440067f7..45b18451c4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
@@ -288,7 +288,15 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
newState.tabPanel = state.tabPanel;
PageParameters params = paramsOf(depot, newState);
- setResponsePage(RevisionComparePage.class, params);
+
+ /*
+ * Use below code instead of calling setResponsePage() to make sure the dropdown is
+ * closed while creating the new page as otherwise clicking other places in original page
+ * while new page is loading will result in ComponentNotFound issue for the dropdown
+ * component
+ */
+ String url = RequestCycle.get().urlFor(RevisionComparePage.class, params).toString();
+ target.appendJavaScript(String.format("window.location.href='%s';", url));
}
});
@@ -316,7 +324,10 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
newState.tabPanel = state.tabPanel;
PageParameters params = RevisionComparePage.paramsOf(depotModel.getObject(), newState);
- setResponsePage(RevisionComparePage.class, params);
+
+ // Refer to comments in left revision picker for not using setResponsePage
+ String url = RequestCycle.get().urlFor(RevisionComparePage.class, params).toString();
+ target.appendJavaScript(String.format("window.location.href='%s';", url));
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
index 73728b98c0..40e6e6e879 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
@@ -29,6 +29,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -247,7 +248,15 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
@Override
protected void onSelect(AjaxRequestTarget target, Depot depot, String branch) {
PageParameters params = paramsOf(depot, new DepotAndBranch(depot, branch), source);
- setResponsePage(NewRequestPage.class, params);
+
+ /*
+ * Use below code instead of calling setResponsePage() to make sure the dropdown is
+ * closed while creating the new page as otherwise clicking other places in original page
+ * while new page is loading will result in ComponentNotFound issue for the dropdown
+ * component
+ */
+ String url = RequestCycle.get().urlFor(NewRequestPage.class, params).toString();
+ target.appendJavaScript(String.format("window.location.href='%s';", url));
}
});
@@ -262,7 +271,10 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
protected void onSelect(AjaxRequestTarget target, Depot depot, String branch) {
PageParameters params = paramsOf(getDepot(), NewRequestPage.this.target,
new DepotAndBranch(depot, branch));
- setResponsePage(NewRequestPage.class, params);
+
+ // Refer to comments in target branch picker for not using setResponsePage
+ String url = RequestCycle.get().urlFor(NewRequestPage.class, params).toString();
+ target.appendJavaScript(String.format("window.location.href='%s';", url));
}
});
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
index e04e11ae35..ccf8d837df 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
@@ -382,7 +382,7 @@ public class RequestOverviewPage extends RequestDetailPage {
@Override
public void onClick() {
- GitPlex.getInstance(PullRequestManager.class).checkStatus(getPullRequest());
+ GitPlex.getInstance(PullRequestManager.class).check(getPullRequest());
Session.get().success("Pull request is synchronized");
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
index b47194918b..795b443f3a 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.html
@@ -1,2 +1,3 @@
<wicket:extend>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
index 8c9092a3c1..54b39e86e3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/test/TestPage.java
@@ -1,5 +1,7 @@
package com.gitplex.server.web.page.test;
+import org.apache.wicket.markup.html.link.Link;
+
import com.gitplex.server.web.page.base.BasePage;
@SuppressWarnings("serial")
@@ -8,6 +10,14 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ }
+
+ });
}
}