diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java new file mode 100644 index 0000000000..6769141cc2 --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgOutgoingCommand.java @@ -0,0 +1,117 @@ +/** + * 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.Changeset; +import sonia.scm.repository.ChangesetPagingResult; +import sonia.scm.repository.HgRepositoryHandler; +import sonia.scm.repository.Repository; +import sonia.scm.repository.spi.javahg.HgOutgoingChangesetCommand; + +//~--- JDK imports ------------------------------------------------------------ + +import java.io.File; + +import java.util.List; + +/** + * + * @author Sebastian Sdorra + */ +public class HgOutgoingCommand extends AbstractCommand + implements OutgoingCommand +{ + + /** + * Constructs ... + * + * + * @param context + * @param repository + * @param handler + */ + public HgOutgoingCommand(HgCommandContext context, Repository repository, + HgRepositoryHandler handler) + { + super(context, repository); + this.handler = handler; + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @param request + * + * @return + */ + @Override + public ChangesetPagingResult getOutgoingChangesets( + OutgoingCommandRequest request) + { + File remoteRepository = handler.getDirectory(request.getRemoteRepository()); + + com.aragost.javahg.Repository repository = open(); + + // TODO implement paging + + List changesets = + on(repository).execute(remoteRepository.getAbsolutePath()); + + return new ChangesetPagingResult(changesets.size(), changesets); + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param repository + * + * @return + */ + private HgOutgoingChangesetCommand on( + com.aragost.javahg.Repository repository) + { + return HgOutgoingChangesetCommand.on(repository, getContext().getConfig()); + } + + //~--- fields --------------------------------------------------------------- + + /** Field description */ + private HgRepositoryHandler handler; +} diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java index 5fdc55f1e1..5060b71e55 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgRepositoryServiceProvider.java @@ -67,7 +67,8 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider Command.LOG, Command.TAGS, Command.BRANCHES, - Command.INCOMING + Command.INCOMING, + Command.OUTGOING ); //J+ @@ -195,6 +196,18 @@ public class HgRepositoryServiceProvider extends RepositoryServiceProvider return new HgLogCommand(context, repository); } + /** + * Method description + * + * + * @return + */ + @Override + public OutgoingCommand getOutgoingCommand() + { + return new HgOutgoingCommand(context, repository, handler); + } + /** * Method description * diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgIncomingChangesetCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgIncomingChangesetCommand.java index 742dc3c4c9..f543d1c5e7 100644 --- a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgIncomingChangesetCommand.java +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgIncomingChangesetCommand.java @@ -34,22 +34,15 @@ package sonia.scm.repository.spi.javahg; //~--- non-JDK imports -------------------------------------------------------- import com.aragost.javahg.Repository; -import com.aragost.javahg.internals.HgInputStream; -import com.google.common.io.Closeables; - -import sonia.scm.repository.Changeset; import sonia.scm.repository.HgConfig; -//~--- JDK imports ------------------------------------------------------------ - -import java.util.List; - /** * * @author Sebastian Sdorra */ -public class HgIncomingChangesetCommand extends AbstractChangesetCommand +public class HgIncomingChangesetCommand + extends HgIncomingOutgoingChangesetCommand { /** @@ -81,34 +74,6 @@ public class HgIncomingChangesetCommand extends AbstractChangesetCommand return new HgIncomingChangesetCommand(repository, config); } - /** - * Method description - * - * - * @param remoteRepository - * - * @return - */ - public List execute(String remoteRepository) - { - cmdAppend("--style", CHANGESET_EAGER_STYLE_PATH); - - List changesets = null; - HgInputStream stream = null; - - try - { - stream = launchStream(remoteRepository); - changesets = readListFromStream(stream); - } - finally - { - Closeables.closeQuietly(stream); - } - - return changesets; - } - //~--- get methods ---------------------------------------------------------- /** diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgIncomingOutgoingChangesetCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgIncomingOutgoingChangesetCommand.java new file mode 100644 index 0000000000..c72eaf663f --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgIncomingOutgoingChangesetCommand.java @@ -0,0 +1,98 @@ +/** + * 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.javahg; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.aragost.javahg.Repository; +import com.aragost.javahg.internals.HgInputStream; + +import com.google.common.io.Closeables; + +import sonia.scm.repository.Changeset; +import sonia.scm.repository.HgConfig; + +//~--- JDK imports ------------------------------------------------------------ + +import java.util.List; + +/** + * + * @author Sebastian Sdorra + */ +public abstract class HgIncomingOutgoingChangesetCommand + extends AbstractChangesetCommand +{ + + /** + * Constructs ... + * + * + * @param repository + * @param config + */ + public HgIncomingOutgoingChangesetCommand(Repository repository, + HgConfig config) + { + super(repository, config); + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param remoteRepository + * + * @return + */ + public List execute(String remoteRepository) + { + cmdAppend("--style", CHANGESET_EAGER_STYLE_PATH); + + List changesets = null; + HgInputStream stream = null; + + try + { + stream = launchStream(remoteRepository); + changesets = readListFromStream(stream); + } + finally + { + Closeables.closeQuietly(stream); + } + + return changesets; + } +} diff --git a/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgOutgoingChangesetCommand.java b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgOutgoingChangesetCommand.java new file mode 100644 index 0000000000..74b15061a0 --- /dev/null +++ b/scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgOutgoingChangesetCommand.java @@ -0,0 +1,90 @@ +/** + * 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.javahg; + +//~--- non-JDK imports -------------------------------------------------------- + +import com.aragost.javahg.Repository; + +import sonia.scm.repository.HgConfig; + +/** + * + * @author Sebastian Sdorra + */ +public class HgOutgoingChangesetCommand + extends HgIncomingOutgoingChangesetCommand +{ + + /** + * Constructs ... + * + * + * @param repository + * @param config + */ + public HgOutgoingChangesetCommand(Repository repository, HgConfig config) + { + super(repository, config); + } + + //~--- methods -------------------------------------------------------------- + + /** + * Method description + * + * + * @param repository + * @param config + * + * @return + */ + public static HgOutgoingChangesetCommand on(Repository repository, + HgConfig config) + { + return new HgOutgoingChangesetCommand(repository, config); + } + + //~--- get methods ---------------------------------------------------------- + + /** + * Method description + * + * + * @return + */ + @Override + public String getCommandName() + { + return "outgoing"; + } +}