[Mercurial] HgWorkingCopyRevisionsCommand.parent: couple of null pointer fixes.

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
index 48df53bf286c9a1b84556a2d271c30d43e020a89..a81b8ff89b302833d89fb9d65c0a258b2480d69c 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
@@ -45,11 +45,7 @@ public class HgWorkingCopyRevisionsCommand {
    */
   @NotNull
   public List<HgRevisionNumber> parents(@NotNull VirtualFile repo) {
-    final Pair<HgRevisionNumber, HgRevisionNumber> parents = parents(repo, null);
-    final List<HgRevisionNumber> result = new ArrayList<HgRevisionNumber>(2);
-    result.add(parents.first);
-    result.add(parents.second);
-    return result;
+    return getRevisions(repo, "parents", null, null);
   }
 
   /**
@@ -73,7 +69,7 @@ public class HgWorkingCopyRevisionsCommand {
     final List<HgRevisionNumber> revisions = getRevisions(repo, "parents", file, revision);
     switch (revisions.size()) {
       case 1: return Pair.create(revisions.get(0), null);
-      case 2: return Pair.create(revisions.get(1), null);
+      case 2: return Pair.create(revisions.get(0), revisions.get(1));
       default: return Pair.create(null, null);
     }
   }