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

implement branch option for mercurial log command

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-07-27 10:54:48 +02:00
parent 09828e2aa9
commit f94b1a43db
2 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/HgLogCommand.java
View File

@@ -110,9 +110,10 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
com.aragost.javahg.Repository repository = open(); com.aragost.javahg.Repository repository = open();
if (!Strings.isNullOrEmpty(request.getPath())) if (!Strings.isNullOrEmpty(request.getPath())
||!Strings.isNullOrEmpty(request.getBranch()))
{ {
result = collectHistory(repository, request); result = collectSafely(repository, request);
} }
else else
{ {
@@ -177,7 +178,7 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
* *
* @return * @return
*/ */
private ChangesetPagingResult collectHistory( private ChangesetPagingResult collectSafely(
com.aragost.javahg.Repository repository, LogCommandRequest request) com.aragost.javahg.Repository repository, LogCommandRequest request)
{ {
HgLogChangesetCommand cmd = HgLogChangesetCommand.on(repository); HgLogChangesetCommand cmd = HgLogChangesetCommand.on(repository);
@@ -198,6 +199,11 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
cmd.rev(startChangeset.concat(":0")); cmd.rev(startChangeset.concat(":0"));
} }
if (!Strings.isNullOrEmpty(request.getBranch()))
{
cmd.branch(request.getBranch());
}
int start = request.getPagingStart(); int start = request.getPagingStart();
int limit = request.getPagingLimit(); int limit = request.getPagingLimit();
@@ -206,14 +212,31 @@ public class HgLogCommand extends AbstractCommand implements LogCommand
if ((start == 0) && (limit < 0)) if ((start == 0) && (limit < 0))
{ {
changesets = cmd.execute(request.getPath()); if (!Strings.isNullOrEmpty(request.getPath()))
{
changesets = cmd.execute(request.getPath());
}
else
{
changesets = cmd.execute();
}
total = changesets.size(); total = changesets.size();
} }
else else
{ {
limit = limit + start; limit = limit + start;
List<Integer> revisionList = cmd.loadRevisions(request.getPath()); List<Integer> revisionList = null;
if (!Strings.isNullOrEmpty(request.getPath()))
{
revisionList = cmd.loadRevisions(request.getPath());
}
else
{
revisionList = cmd.loadRevisions();
}
if ((limit > revisionList.size()) || (limit < 0)) if ((limit > revisionList.size()) || (limit < 0))
{ {

16
scm-plugins/scm-hg-plugin/src/main/java/sonia/scm/repository/spi/javahg/HgLogChangesetCommand.java
View File

@@ -30,6 +30,7 @@
*/ */
package sonia.scm.repository.spi.javahg; package sonia.scm.repository.spi.javahg;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
@@ -115,6 +116,21 @@ public class HgLogChangesetCommand extends AbstractCommand
return new HgLogChangesetCommand(repository); return new HgLogChangesetCommand(repository);
} }
/**
* Method description
*
*
* @param branch
*
* @return
*/
public HgLogChangesetCommand branch(String branch)
{
cmdAppend("-b", branch);
return this;
}
/** /**
* Method description * Method description
* *