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

fix missing p2 revision and use shorter property names

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-12-07 09:55:26 +01:00
parent cbf95bd9b5
commit 8eb6dff48d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,13 +89,13 @@ public class HgLogChangesetCommand extends AbstractCommand
"0000000000000000000000000000000000000000"; "0000000000000000000000000000000000000000";
/** changeset property for parent1 revision */ /** changeset property for parent1 revision */
private static final String PROPERTY_PARENT1_REVISION = "hg.parent1.revision"; private static final String PROPERTY_PARENT1_REVISION = "hg.p1.rev";
/** changeset property for parent2 revision */ /** changeset property for parent2 revision */
private static final String PROPERTY_PARENT2_REVISION = "hg.parent2.revision"; private static final String PROPERTY_PARENT2_REVISION = "hg.p2.rev";
/** changeset property for node revision */ /** changeset property for node revision */
private static final String PROPERTY_REVISION = "hg.revision"; private static final String PROPERTY_REVISION = "hg.rev";
//~--- constructors --------------------------------------------------------- //~--- constructors ---------------------------------------------------------
@@ -295,6 +295,8 @@ public class HgLogChangesetCommand extends AbstractCommand
changeset.getParents().add(p1); changeset.getParents().add(p1);
} }
in.mustMatch(' ');
String p2 = readId(in, changeset, PROPERTY_PARENT2_REVISION); String p2 = readId(in, changeset, PROPERTY_PARENT2_REVISION);
if (!isNullId(p2)) if (!isNullId(p2))
@@ -391,7 +393,7 @@ public class HgLogChangesetCommand extends AbstractCommand
{ {
Integer rev = in.readDecimal(); Integer rev = in.readDecimal();
if (rev != null) if (rev != null && rev >= 0)
{ {
changeset.setProperty(propertyKey, String.valueOf(rev)); changeset.setProperty(propertyKey, String.valueOf(rev));
} }