mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-12-21 15:59:48 +01:00
Add changesets command to enable commit search (#2106)
Introduce changesets command to find all changesets for a single repository. This is required to index all changesets for the commit search.
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package sonia.scm.repository.spi;
|
||||
|
||||
import org.tmatesoft.svn.core.ISVNLogEntryHandler;
|
||||
import org.tmatesoft.svn.core.SVNLogEntry;
|
||||
import sonia.scm.repository.Changeset;
|
||||
import sonia.scm.repository.SvnUtil;
|
||||
|
||||
import java.util.Collection;
|
||||
|
||||
/**
|
||||
* Collect and convert changesets.
|
||||
*/
|
||||
class ChangesetCollector implements ISVNLogEntryHandler {
|
||||
|
||||
private final Collection<Changeset> changesets;
|
||||
|
||||
public ChangesetCollector(Collection<Changeset> changesets) {
|
||||
this.changesets = changesets;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleLogEntry(SVNLogEntry logEntry) {
|
||||
changesets.add(SvnUtil.createChangeset(logEntry));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package sonia.scm.repository.spi;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import org.tmatesoft.svn.core.SVNException;
|
||||
import org.tmatesoft.svn.core.io.SVNRepository;
|
||||
import sonia.scm.repository.Changeset;
|
||||
import sonia.scm.repository.InternalRepositoryException;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Optional;
|
||||
|
||||
public class SvnChangesetsCommand extends AbstractSvnCommand implements ChangesetsCommand {
|
||||
|
||||
SvnChangesetsCommand(SvnContext context) {
|
||||
super(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Iterable<Changeset> getChangesets(ChangesetsCommandRequest request) {
|
||||
try {
|
||||
SVNRepository repo = open();
|
||||
long startRev = repo.getLatestRevision();
|
||||
// We ignore the changeset 0, because it doesn't have any values like author or description
|
||||
long endRev = 1;
|
||||
final List<Changeset> changesets = Lists.newArrayList();
|
||||
|
||||
repo.log(null, startRev, endRev, true, true, new ChangesetCollector(changesets));
|
||||
return changesets;
|
||||
} catch (SVNException ex) {
|
||||
throw new InternalRepositoryException(repository, "could not open repository", ex);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Optional<Changeset> getLatestChangeset() {
|
||||
try {
|
||||
SVNRepository repo = open();
|
||||
long latestRevision = repo.getLatestRevision();
|
||||
final List<Changeset> changesets = Lists.newArrayList();
|
||||
|
||||
repo.log(null, latestRevision, latestRevision, true, true, new ChangesetCollector(changesets));
|
||||
|
||||
if (!changesets.isEmpty()) {
|
||||
return Optional.of(changesets.get(0));
|
||||
}
|
||||
return Optional.empty();
|
||||
} catch (SVNException ex) {
|
||||
throw new InternalRepositoryException(repository, "could not open repository", ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -179,21 +179,4 @@ public class SvnLogCommand extends AbstractSvnCommand implements LogCommand {
|
||||
return new ChangesetPagingResult(total,
|
||||
SvnUtil.createChangesets(changesetList));
|
||||
}
|
||||
|
||||
/**
|
||||
* Collect and convert changesets.
|
||||
*/
|
||||
private static class ChangesetCollector implements ISVNLogEntryHandler {
|
||||
|
||||
private final Collection<Changeset> changesets;
|
||||
|
||||
public ChangesetCollector(Collection<Changeset> changesets) {
|
||||
this.changesets = changesets;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleLogEntry(SVNLogEntry logEntry) {
|
||||
changesets.add(SvnUtil.createChangeset(logEntry));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +56,8 @@ public class SvnRepositoryServiceProvider extends RepositoryServiceProvider {
|
||||
Command.LOOKUP,
|
||||
Command.FULL_HEALTH_CHECK,
|
||||
Command.MIRROR,
|
||||
Command.FILE_LOCK
|
||||
Command.FILE_LOCK,
|
||||
Command.CHANGESETS
|
||||
);
|
||||
|
||||
public static final Set<Feature> FEATURES = EnumSet.of(
|
||||
@@ -161,4 +162,7 @@ public class SvnRepositoryServiceProvider extends RepositoryServiceProvider {
|
||||
public FileLockCommand getFileLockCommand() {
|
||||
return new SvnFileLockCommand(context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ChangesetsCommand getChangesetsCommand() { return new SvnChangesetsCommand(context);}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
* MIT License
|
||||
*
|
||||
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in all
|
||||
* copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
package sonia.scm.repository.spi;
|
||||
|
||||
import org.junit.Test;
|
||||
import sonia.scm.repository.Changeset;
|
||||
|
||||
import java.util.Optional;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
public class SvnChangesetsCommandTest extends AbstractSvnCommandTestBase {
|
||||
|
||||
@Test
|
||||
public void getAllChangesetsFromRepository() {
|
||||
Iterable<Changeset> changesets = createCommand().getChangesets(new ChangesetsCommandRequest());
|
||||
|
||||
assertThat(changesets).hasSize(5);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getLatestChangesetFromRepository() {
|
||||
Optional<Changeset> changeset = createCommand().getLatestChangeset();
|
||||
|
||||
assertThat(changeset).isPresent();
|
||||
assertThat(changeset.get().getId()).isEqualTo("5");
|
||||
}
|
||||
|
||||
private SvnChangesetsCommand createCommand()
|
||||
{
|
||||
return new SvnChangesetsCommand(createContext());
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user