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

improve changeset generation

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-07-04 09:09:27 +02:00
parent 4aad609ea9
commit 2e2cb9cd9c
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@ import com.aragost.javahg.internals.HgInputStream;
import com.aragost.javahg.internals.RuntimeIOException; import com.aragost.javahg.internals.RuntimeIOException;
import com.aragost.javahg.internals.Utils; import com.aragost.javahg.internals.Utils;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
@@ -61,6 +60,9 @@ import java.util.List;
public class HgLogChangesetCommand extends AbstractCommand public class HgLogChangesetCommand extends AbstractCommand
{ {
/** Field description */
private static final String BRANCH_DEFAULT = "default";
/** /**
* Character sequence that indicate the begin and end of the * Character sequence that indicate the begin and end of the
* changeset in the command output. * changeset in the command output.
@@ -71,9 +73,13 @@ public class HgLogChangesetCommand extends AbstractCommand
/** Field description */ /** Field description */
private static final String CHANGESET_EAGER_STYLE_PATH = private static final String CHANGESET_EAGER_STYLE_PATH =
Utils.resourceAsFile("/styles/changesets-eager.style", Utils.resourceAsFile("/sonia/scm/styles/changesets-eager.style",
ImmutableMap.of("pattern", CHANGESET_PATTERN)).getPath(); ImmutableMap.of("pattern", CHANGESET_PATTERN)).getPath();
/** Field description */
private static final String NULL_ID =
"0000000000000000000000000000000000000000";
//~--- constructors --------------------------------------------------------- //~--- constructors ---------------------------------------------------------
/** /**
@@ -210,13 +216,16 @@ public class HgLogChangesetCommand extends AbstractCommand
String branch = in.textUpTo('\n'); String branch = in.textUpTo('\n');
changeset.getBranches().add(branch); if (!BRANCH_DEFAULT.equals(branch))
{
changeset.getBranches().add(branch);
}
// in.upTo(':'); in.upTo(':');
String p1 = in.nextAsText(40); String p1 = in.nextAsText(40);
if (!Strings.isNullOrEmpty(p1)) if (!NULL_ID.equals(p1))
{ {
changeset.getParents().add(p1); changeset.getParents().add(p1);
} }
@@ -225,7 +234,7 @@ public class HgLogChangesetCommand extends AbstractCommand
String p2 = in.nextAsText(40); String p2 = in.nextAsText(40);
if (!Strings.isNullOrEmpty(p2)) if (!NULL_ID.equals(p2))
{ {
changeset.getParents().add(p2); changeset.getParents().add(p2);
} }
@@ -238,6 +247,7 @@ public class HgLogChangesetCommand extends AbstractCommand
while (line.length() > 0) while (line.length() > 0)
{ {
if (line.startsWith("a ")) if (line.startsWith("a "))
{ {
modifications.getAdded().add(line.substring(2)); modifications.getAdded().add(line.substring(2));