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

IDEA-87811 vcs: support line status markers for "modified without checkout" files

Browse Source
This commit is contained in:
Aleksey Pivovarov
2019-02-05 12:23:26 +03:00
parent 84337e0168
commit bbb15eb971
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsFileStatusProvider.java
+16 -5
View File
@@ -148,11 +148,22 @@ public class VcsFileStatusProvider implements FileStatusProvider, VcsBaseContent
VcsBaseContentProvider provider = findProviderFor(file);
return provider == null ? null : provider.getBaseRevision(file);
}
final Change change = ChangeListManager.getInstance(myProject).getChange(file);
if (change == null) return null;
final ContentRevision beforeRevision = change.getBeforeRevision();
if (beforeRevision == null) return null;
return new BaseContentImpl(beforeRevision);
ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
Change change = changeListManager.getChange(file);
if (change != null) {
ContentRevision beforeRevision = change.getBeforeRevision();
return beforeRevision == null ? null : new BaseContentImpl(beforeRevision);
}
FileStatus status = changeListManager.getStatus(file);
if (status == FileStatus.HIJACKED) {
VcsCurrentRevisionProxy beforeRevision = VcsCurrentRevisionProxy.create(file, myProject);
return beforeRevision == null ? null : new BaseContentImpl(beforeRevision);
}
return null;
}
@Nullable