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

merge with branch 1.x

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-12-06 15:42:10 +01:00
parent 7cb36c4a16 120fe9a5a4
commit d6ce7383d6
75 changed files with 5923 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/AbstractHgPushOrPullCommand.java Normal file
View File

@@ -0,0 +1,99 @@
/**
* Copyright (c) 2010, Sebastian Sdorra
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. Neither the name of SCM-Manager; nor the names of its
* contributors may be used to endorse or promote products derived from this
* software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* http://bitbucket.org/sdorra/scm-manager
*
*/
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.Repository;
/**
*
* @author Sebastian Sdorra <s.sdorra@gmail.com>
*/
public class AbstractHgPushOrPullCommand extends AbstractCommand
{
/**
* Constructs ...
*
*
* @param handler
* @param context
* @param repository
*/
protected AbstractHgPushOrPullCommand(HgRepositoryHandler handler,
HgCommandContext context, Repository repository)
{
super(context, repository);
this.handler = handler;
}
//~--- get methods ----------------------------------------------------------
/**
* Method description
*
*
* @param request
*
* @return
*/
protected String getRemoteUrl(RemoteCommandRequest request)
{
String url;
Repository repo = request.getRemoteRepository();
if (repo != null)
{
url =
handler.getDirectory(request.getRemoteRepository()).getAbsolutePath();
}
else if (request.getRemoteUrl() != null)
{
url = request.getRemoteUrl().toExternalForm();
}
else
{
throw new IllegalArgumentException("url or repository is required");
}
return url;
}
//~--- fields ---------------------------------------------------------------
/** Field description */
protected final HgRepositoryHandler handler;
}

29
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPullCommand.java
View File

@@ -30,6 +30,7 @@
*/
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
@@ -37,6 +38,9 @@ package sonia.scm.repository.spi;
import com.aragost.javahg.Changeset;
import com.aragost.javahg.commands.ExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryException;
@@ -44,7 +48,6 @@ import sonia.scm.repository.api.PullResponse;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException;
import java.util.Collections;
@@ -54,9 +57,16 @@ import java.util.List;
*
* @author Sebastian Sdorra
*/
public class HgPullCommand extends AbstractCommand implements PullCommand
public class HgPullCommand extends AbstractHgPushOrPullCommand
implements PullCommand
{
/** Field description */
private static final Logger logger =
LoggerFactory.getLogger(HgPullCommand.class);
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
@@ -68,8 +78,7 @@ public class HgPullCommand extends AbstractCommand implements PullCommand
public HgPullCommand(HgRepositoryHandler handler, HgCommandContext context,
Repository repository)
{
super(context, repository);
this.handler = handler;
super(handler, context, repository);
}
//~--- methods --------------------------------------------------------------
@@ -90,14 +99,15 @@ public class HgPullCommand extends AbstractCommand implements PullCommand
public PullResponse pull(PullCommandRequest request)
throws RepositoryException, IOException
{
File remoteRepository = handler.getDirectory(request.getRemoteRepository());
String url = getRemoteUrl(request);
logger.debug("pull changes from {} to {}", url, getRepository().getId());
List<Changeset> result = Collections.EMPTY_LIST;
try
{
result = com.aragost.javahg.commands.PullCommand.on(open()).execute(
remoteRepository.getAbsolutePath());
result = com.aragost.javahg.commands.PullCommand.on(open()).execute(url);
}
catch (ExecutionException ex)
{
@@ -106,9 +116,4 @@ public class HgPullCommand extends AbstractCommand implements PullCommand
return new PullResponse(result.size());
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private final HgRepositoryHandler handler;
}

29
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgPushCommand.java
View File

@@ -30,6 +30,7 @@
*/
package sonia.scm.repository.spi;
//~--- non-JDK imports --------------------------------------------------------
@@ -37,6 +38,9 @@ package sonia.scm.repository.spi;
import com.aragost.javahg.Changeset;
import com.aragost.javahg.commands.ExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.repository.HgRepositoryHandler;
import sonia.scm.repository.Repository;
import sonia.scm.repository.RepositoryException;
@@ -44,7 +48,6 @@ import sonia.scm.repository.api.PushResponse;
//~--- JDK imports ------------------------------------------------------------
import java.io.File;
import java.io.IOException;
import java.util.Collections;
@@ -54,9 +57,16 @@ import java.util.List;
*
* @author Sebastian Sdorra
*/
public class HgPushCommand extends AbstractCommand implements PushCommand
public class HgPushCommand extends AbstractHgPushOrPullCommand
implements PushCommand
{
/** Field description */
private static final Logger logger =
LoggerFactory.getLogger(HgPushCommand.class);
//~--- constructors ---------------------------------------------------------
/**
* Constructs ...
*
@@ -68,8 +78,7 @@ public class HgPushCommand extends AbstractCommand implements PushCommand
public HgPushCommand(HgRepositoryHandler handler, HgCommandContext context,
Repository repository)
{
super(context, repository);
this.handler = handler;
super(handler, context, repository);
}
//~--- methods --------------------------------------------------------------
@@ -90,14 +99,15 @@ public class HgPushCommand extends AbstractCommand implements PushCommand
public PushResponse push(PushCommandRequest request)
throws RepositoryException, IOException
{
File remoteRepository = handler.getDirectory(request.getRemoteRepository());
String url = getRemoteUrl(request);
logger.debug("push changes from {} to {}", getRepository().getId(), url);
List<Changeset> result = Collections.EMPTY_LIST;
try
{
result = com.aragost.javahg.commands.PushCommand.on(open()).execute(
remoteRepository.getAbsolutePath());
result = com.aragost.javahg.commands.PushCommand.on(open()).execute(url);
}
catch (ExecutionException ex)
{
@@ -106,9 +116,4 @@ public class HgPushCommand extends AbstractCommand implements PushCommand
return new PushResponse(result.size());
}
//~--- fields ---------------------------------------------------------------
/** Field description */
private final HgRepositoryHandler handler;
}