Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-02 03:25:56 +01:00
Code Issues Packages Projects Releases Activity

remove revision 0 from svn log command

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-01-15 14:06:24 +01:00
parent c7320bfcf6
commit 34838dc889
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLogCommand.java
View File

@@ -166,7 +166,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
{
long latest = repo.getLatestRevision();
long startRev = latest - start;
long endRev = Math.max(startRev - (limit - 1), 0);
long endRev = Math.max(startRev - (limit - 1), 1);
final List<Changeset> changesets = Lists.newArrayList();
@@ -177,7 +177,7 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand
new ChangesetCollector(changesets));
}
return new ChangesetPagingResult((int) (latest + 1l), changesets);
return new ChangesetPagingResult((int) latest, changesets);
}
/**

16
scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnLogCommandTest.java
View File

@@ -34,6 +34,7 @@ package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import com.google.common.collect.Iterables;
import org.junit.Test;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
@@ -59,8 +60,15 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
createCommand().getChangesets(new LogCommandRequest());
assertNotNull(result);
assertEquals(6, result.getTotal());
assertEquals(6, result.getChangesets().size());
assertEquals(5, result.getTotal());
assertEquals(5, result.getChangesets().size());
}
@Test
public void testShouldStartWithRevisionOne() {
ChangesetPagingResult result = createCommand().getChangesets(new LogCommandRequest());
Changeset first = Iterables.getLast(result);
assertEquals(first.getId(), "1");
}
@Test
@@ -88,7 +96,7 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
ChangesetPagingResult result = createCommand().getChangesets(request);
assertNotNull(result);
assertEquals(6, result.getTotal());
assertEquals(5, result.getTotal());
assertEquals(2, result.getChangesets().size());
Changeset c1 = result.getChangesets().get(0);
@@ -112,7 +120,7 @@ public class SvnLogCommandTest extends AbstractSvnCommandTestBase
ChangesetPagingResult result = createCommand().getChangesets(request);
assertNotNull(result);
assertEquals(6, result.getTotal());
assertEquals(5, result.getTotal());
assertEquals(2, result.getChangesets().size());
Changeset c1 = result.getChangesets().get(0);