MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kirill Likhodedov
2010-08-06 16:19:59 +04:00
parent d9e5089926
commit 579d8553c1
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
+2 -6
View File
@@ -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);
}
}