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

[vcs-log] changed and moved paths are mutually exclusive

Browse Source
This commit is contained in:
Julia Beliaeva
2017-06-04 23:29:08 +03:00
parent ad2309b009
commit 1b7884e26f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsChangesLazilyParsedDetails.java
+4 -2
View File
@@ -66,8 +66,10 @@ public class VcsChangesLazilyParsedDetails extends VcsCommitMetadataImpl impleme
public Collection<String> getModifiedPaths() {
Set<String> changedPaths = ContainerUtil.newHashSet();
for (Change change : getChanges()) {
if (change.getAfterRevision() != null) changedPaths.add(change.getAfterRevision().getFile().getPath());
if (change.getBeforeRevision() != null) changedPaths.add(change.getBeforeRevision().getFile().getPath());
if (!change.getType().equals(Change.Type.MOVED)) {
if (change.getAfterRevision() != null) changedPaths.add(change.getAfterRevision().getFile().getPath());
if (change.getBeforeRevision() != null) changedPaths.add(change.getBeforeRevision().getFile().getPath());
}
}
return changedPaths;
}
plugins/git4idea/src/git4idea/GitCommit.java
+2 -4
View File
@@ -58,10 +58,8 @@ public final class GitCommit extends VcsChangesLazilyParsedDetails {
if (data != null) {
Set<String> changes = ContainerUtil.newHashSet();
for (GitLogStatusInfo status : ((MyChangesComputable)myChangesGetter).getMergedChanges()) {
changes.add(absolutePath(status.getFirstPath()));
String secondPath = status.getSecondPath();
if (secondPath != null) {
changes.add(absolutePath(secondPath));
if (status.getSecondPath() == null) {
changes.add(absolutePath(status.getFirstPath()));
}
}
return changes;