From a449760fcb7bb1f2da3a7333f78327f357976e69 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Wed, 11 May 2016 19:32:53 +0300 Subject: [PATCH] [hg]: implement 'Compare with the same repository version' for uncommitted renamed file --- .../src/org/zmlx/hg4idea/provider/HgDiffProvider.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffProvider.java index 49ac18b25ec9..e8ebb5595e17 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffProvider.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffProvider.java @@ -15,17 +15,18 @@ package org.zmlx.hg4idea.provider; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vcs.ObjectsConvertor; +import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.ContentRevision; import com.intellij.openapi.vcs.diff.DiffProvider; import com.intellij.openapi.vcs.diff.ItemLatestState; import com.intellij.openapi.vcs.history.VcsRevisionNumber; -import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.vcsUtil.VcsUtil; import org.zmlx.hg4idea.HgContentRevision; import org.zmlx.hg4idea.HgFile; import org.zmlx.hg4idea.HgRevisionNumber; import org.zmlx.hg4idea.command.HgWorkingCopyRevisionsCommand; +import org.zmlx.hg4idea.util.HgUtil; public class HgDiffProvider implements DiffProvider { @@ -95,7 +96,7 @@ public class HgDiffProvider implements DiffProvider { if (hgRevisionNumber.isWorkingVersion()) { throw new IllegalStateException("Should not compare against working copy"); } - HgFile hgFile = new HgFile(vcsRoot, VfsUtilCore.virtualToIoFile(file)); + HgFile hgFile = new HgFile(vcsRoot, HgUtil.getOriginalFileName(VcsUtil.getFilePath(file), ChangeListManager.getInstance(project))); return HgContentRevision.create(project, hgFile, hgRevisionNumber); }