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

fix Hg revision construction for added/deleted status: see api for get revision After and get revision Before

Browse Source
This commit is contained in:
Nadya Zabrodina
2015-05-27 22:50:27 +04:00
parent 60ead2d987
commit b9e0ca0a2b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/log/HgHistoryUtil.java
+6 -4
View File
@@ -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);
}