Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-06 13:35:44 +01:00
Code Issues Packages Projects Releases Activity

reimplement getChangesets by request

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-06-11 15:46:19 +02:00
parent c8b5902650
commit c209def286
1 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
View File

@@ -169,47 +169,8 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
if (!gr.getAllRefs().isEmpty())
{
org.eclipse.jgit.api.LogCommand cmd = new Git(gr).log();
converter = new GitChangesetConverter(gr, GitUtil.ID_LENGTH);
if (!Strings.isNullOrEmpty(request.getPath()))
{
cmd.addPath(request.getPath());
}
if (!Strings.isNullOrEmpty(request.getStartChangeset()))
{
ObjectId start = GitUtil.getRevisionId(gr,
request.getStartChangeset());
if (!Strings.isNullOrEmpty(request.getEndChangeset()))
{
ObjectId end = GitUtil.getRevisionId(gr,
request.getEndChangeset());
cmd.addRange(start, end);
}
else
{
cmd.add(start);
}
}
else
{
cmd.add(GitUtil.getRepositoryHead(gr));
}
if (!Strings.isNullOrEmpty(request.getBranch()))
{
ObjectId branchId = GitUtil.getBranchId(gr, request.getBranch());
if (branchId != null)
{
cmd.add(branchId);
}
}
int counter = 0;
int start = request.getPagingStart();
@@ -225,18 +186,53 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
List<Changeset> changesetList = Lists.newArrayList();
int limit = request.getPagingLimit();
boolean started = false;
ObjectId startId = null;
if (!Strings.isNullOrEmpty(request.getStartChangeset()))
{
startId = gr.resolve(request.getStartChangeset());
}
ObjectId endId = null;
if (!Strings.isNullOrEmpty(request.getStartChangeset()))
{
endId = gr.resolve(request.getEndChangeset());
}
org.eclipse.jgit.api.LogCommand cmd = new Git(gr).log().all();
if (!Strings.isNullOrEmpty(request.getPath()))
{
cmd = cmd.addPath(request.getPath());
}
for (RevCommit commit : cmd.call())
{
if ((counter >= start) && ((limit < 0) || (counter < start + limit)))
if (!started && ((startId == null) || commit.getId().equals(startId)))
{
changesetList.add(converter.createChangeset(commit));
started = true;
}
counter++;
if (started)
{
if ((counter >= start)
&& ((limit < 0) || (counter < start + limit)))
{
changesetList.add(converter.createChangeset(commit));
}
counter++;
if ((endId != null) && commit.getId().equals(endId))
{
break;
}
}
}
changesets = new ChangesetPagingResult(start, changesetList);
changesets = new ChangesetPagingResult(counter, changesetList);
}
else if (logger.isWarnEnabled())
{