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

Fix SVN repo mirror update (#1745)

Browse Source 
Initialize svn repository on mirror update if first initialization failed.
This commit is contained in:
Eduard Heimbuch
2021-07-28 11:26:33 +02:00
committed by GitHub
parent e68c178c86
commit e560d20d5a
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/svn_mirror_update.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: Fixed
description: Fix svn mirror update if first initialization failed before ([#1745](https://github.com/scm-manager/scm-manager/pull/1745))

15
scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnMirrorCommand.java
View File

@@ -85,7 +85,7 @@ public class SvnMirrorCommand extends AbstractSvnCommand implements MirrorComman
SVNURL url = createUrlForLocalRepository();
SVNAdminClient admin = createAdminClient(url, mirrorCommandRequest);
consumer.accept(admin);
handleConsumer(mirrorCommandRequest, consumer, url, admin);
afterUpdate = context.open().getLatestRevision();
} catch (SVNException e) {
LOG.info("Could not mirror svn repository", e);
@@ -104,6 +104,19 @@ public class SvnMirrorCommand extends AbstractSvnCommand implements MirrorComman
);
}
private void handleConsumer(MirrorCommandRequest mirrorCommandRequest, AdminConsumer consumer, SVNURL url, SVNAdminClient admin) throws SVNException {
try {
consumer.accept(admin);
} catch (SVNException e) {
if (e.getMessage().equals("svn: E204899: Destination repository has not been initialized")) {
SVNURL source = SVNURL.parseURIEncoded(mirrorCommandRequest.getSourceUrl());
admin.doCompleteSynchronize(source, url);
} else {
throw e;
}
}
}
private SVNURL createUrlForLocalRepository() {
try {
return SVNURL.fromFile(context.getDirectory());

8
scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/spi/SvnMirrorCommandTest.java
View File

@@ -82,6 +82,14 @@ public class SvnMirrorCommandTest extends AbstractSvnCommandTestBase {
assertThat(result.getLog()).contains("Updated from revision 0 to revision 5");
}
@Test
public void shouldDoMirrorUpdateOnNotInitializedRepo() {
MirrorCommandResult result = callMirrorUpdate(emptyContext, repositoryDirectory);
assertThat(result.getResult()).isEqualTo(OK);
assertThat(result.getLog()).contains("Updated from revision 0 to revision 5");
}
@Test
public void shouldUseCredentials() {
MirrorCommandResult result = callMirror(emptyContext, repositoryDirectory, createCredential("svnadmin", "secret"));