From b9e0ca0a2b76c3e8cdf79485873944f38bd2bd2d Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Wed, 20 May 2015 18:34:46 +0400 Subject: [PATCH] fix Hg revision construction for added/deleted status: see api for get revision After and get revision Before --- .../src/org/zmlx/hg4idea/log/HgHistoryUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java index e5df3276ce7b..c7c635bb0de0 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java @@ -323,15 +323,17 @@ public class HgHistoryUtil { FileStatus aStatus) { HgContentRevision beforeRevision = - fileBefore == null ? null : HgContentRevision.create(project, new HgFile(root, new File(root.getPath(), fileBefore)), revisionBefore); + fileBefore == null || aStatus == FileStatus.ADDED ? null + : HgContentRevision + .create(project, new HgFile(root, new File(root.getPath(), fileBefore)), revisionBefore); if (revisionAfter == null && fileBefore != null) { ContentRevision currentRevision = CurrentContentRevision.create(new HgFile(root, new File(root.getPath(), fileBefore)).toFilePath()); return new Change(beforeRevision, currentRevision, aStatus); } - HgContentRevision afterRevision = fileAfter == null ? null : - HgContentRevision - .create(project, new HgFile(root, new File(root.getPath(), fileAfter)), revisionAfter); + HgContentRevision afterRevision = + fileAfter == null || aStatus == FileStatus.DELETED ? null : + HgContentRevision.create(project, new HgFile(root, new File(root.getPath(), fileAfter)), revisionAfter); return new Change(beforeRevision, afterRevision, aStatus); }