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

[shelf]: change FilePathForNonLocal to ordinary

Browse Source
This commit is contained in:
Nadya Zabrodina
2015-08-24 20:14:02 +03:00
parent ff006a9d33
commit bf250029e1
4 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/BinaryFilePatchInProgress.java
+2 -4
View File
@@ -52,10 +52,8 @@ public class BinaryFilePatchInProgress extends AbstractFilePatchInProgress<Shelv
if (myNewContentRevision != null) return myNewContentRevision;
if (myPatch.getAfterFileName() != null) {
final FilePath newFilePath = FilePatchStatus.ADDED.equals(myStatus)
? VcsUtil.getFilePathOnNonLocal(myIoCurrentBase.getAbsolutePath(),
false)
: detectNewFilePathForMovedOrModified();
final FilePath newFilePath = FilePatchStatus.ADDED.equals(myStatus) ? VcsUtil.getFilePath(myIoCurrentBase, false)
: detectNewFilePathForMovedOrModified();
myNewContentRevision = new ShelvedBinaryContentRevision(newFilePath, myPatch.getShelvedBinaryFile().SHELVED_PATH);
}
return myNewContentRevision;
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/TextFilePatchInProgress.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class TextFilePatchInProgress extends AbstractFilePatchInProgress<TextFil
if (myNewContentRevision == null) {
myConflicts = null;
if (FilePatchStatus.ADDED.equals(myStatus)) {
final FilePath newFilePath = VcsUtil.getFilePathOnNonLocal(myIoCurrentBase.getAbsolutePath(), false);
final FilePath newFilePath = VcsUtil.getFilePath(myIoCurrentBase, false);
final String content = myPatch.getNewFileText();
myNewContentRevision = new SimpleContentRevision(content, newFilePath, myPatch.getAfterVersionId());
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedBinaryFile.java
+1 -4
View File
@@ -93,10 +93,7 @@ public class ShelvedBinaryFile implements JDOMExternalizable {
};
}
if (AFTER_PATH != null) {
File fileAfter = new File(baseDir, AFTER_PATH);
final FilePath file =
getFileStatus().equals(FileStatus.ADDED) ? VcsUtil.getFilePathOnNonLocal(fileAfter.getAbsolutePath(), false) : VcsUtil.getFilePath(
fileAfter, false);
final FilePath file = VcsUtil.getFilePath(new File(baseDir, AFTER_PATH), false);
after = new ShelvedBinaryContentRevision(file, SHELVED_PATH);
}
return new Change(before, after);
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelvedChange.java
+1 -5
View File
@@ -148,11 +148,7 @@ public class ShelvedChange {
}
ContentRevision afterRevision = null;
if (myFileStatus != FileStatus.DELETED) {
File afterFile = getAbsolutePath(baseDir, myAfterPath);
FilePath afterPath = getFileStatus().equals(FileStatus.ADDED)
? VcsUtil.getFilePathOnNonLocal(afterFile.getAbsolutePath(), false)
: VcsUtil.getFilePath(
afterFile, false);
FilePath afterPath = VcsUtil.getFilePath(getAbsolutePath(baseDir, myAfterPath), false);
afterRevision = new PatchedContentRevision(project, beforePath, afterPath);
}
myChange = new Change(beforeRevision, afterRevision, myFileStatus);