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

IDEADEV-41484 (Files are moved from one changelist into another) - logging, some reasonable corrections

Browse Source
This commit is contained in:
irengrig
2009-11-26 14:52:50 +03:00
parent c935699ee9
commit c13145b67c
6 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/changes/LocalChangeList.java
-2
View File
@@ -57,8 +57,6 @@ public abstract class LocalChangeList implements Cloneable, ChangeList {
public abstract boolean isDefault();
public abstract boolean isInUpdate();
public abstract boolean isReadOnly();
public abstract void setReadOnly(boolean isReadOnly);
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListWorker.java
+9 -1
View File
@@ -231,6 +231,8 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
}
public boolean addChangeToList(@NotNull final String name, final Change change, final VcsKey vcsKey) {
LOG.debug("[addChangeToList] name: " + name + " change: " + ChangesUtil.getFilePath(change).getPath() + " vcs: " +
(vcsKey == null ? null : vcsKey.getName()));
final LocalChangeList changeList = myMap.get(name);
if (changeList != null) {
((LocalChangeListImpl) changeList).addChange(change);
@@ -241,10 +243,16 @@ public class ChangeListWorker implements ChangeListsWriteOperations {
}
public void addChangeToCorrespondingList(final Change change, final VcsKey vcsKey) {
final String path = LOG.isDebugEnabled() ? ChangesUtil.getFilePath(change).getPath() : "";
LOG.debug("[addChangeToCorrespondingList] for change " + path);
assert myDefault != null;
for (LocalChangeList list : myMap.values()) {
if (list.isDefault()) continue;
if (list.isDefault()) {
LOG.debug("[addChangeToCorrespondingList] skip default list: " + list.getName());
continue;
}
if (((LocalChangeListImpl) list).processChange(change)) {
LOG.debug("[addChangeToCorrespondingList] matched: " + list.getName());
myIdx.changeAdded(change, vcsKey);
correctChangeListEditHandler(list);
return;
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LocalChangeListImpl.java
+19 -54
View File
@@ -31,10 +31,7 @@ public class LocalChangeListImpl extends LocalChangeList {
private boolean myIsDefault = false;
private boolean myIsReadOnly = false;
private Collection<Change> myOutdatedChanges;
private boolean myIsInUpdate = false;
private ChangeHashSet myChangesBeforeUpdate;
private ChangeListEditHandler myEditHandler;
public static LocalChangeListImpl createEmptyChangeListImpl(Project project, String name) {
return new LocalChangeListImpl(project, name);
@@ -58,11 +55,7 @@ public class LocalChangeListImpl extends LocalChangeList {
private void createReadChangesCache() {
if (myReadChangesCache == null) {
final HashSet<Change> changes = new HashSet<Change>(myChanges);
if (myOutdatedChanges != null) {
changes.addAll(myOutdatedChanges);
}
myReadChangesCache = Collections.unmodifiableCollection(changes);
myReadChangesCache = Collections.unmodifiableCollection(new HashSet<Change>(myChanges));
}
}
@@ -81,14 +74,8 @@ public class LocalChangeListImpl extends LocalChangeList {
return myName;
}
// seems that here we can do "rename list with the same name inside ChangeListManagerImpl"
// because it's likely that usages of this method is like that.
// but it is not very good... it can mix everything up
public void setName(@NotNull final String name) {
if (! myName.equals(name)) {
String oldName = myName;
ChangeListManagerImpl.getInstanceImpl(myProject).editName(oldName, name);
myName = name;
}
}
@@ -100,7 +87,6 @@ public class LocalChangeListImpl extends LocalChangeList {
// same as for setName()
public void setComment(final String comment) {
if (! Comparing.equal(comment, myComment)) {
ChangeListManagerImpl.getInstanceImpl(myProject).editComment(myName, comment);
myComment = comment != null ? comment : "";
}
}
@@ -117,10 +103,6 @@ public class LocalChangeListImpl extends LocalChangeList {
return myIsDefault;
}
public synchronized boolean isInUpdate() {
return myIsInUpdate;
}
void setDefault(final boolean isDefault) {
myIsDefault = isDefault;
}
@@ -134,7 +116,7 @@ public class LocalChangeListImpl extends LocalChangeList {
}
synchronized void addChange(Change change) {
if (!myIsInUpdate) myReadChangesCache = null;
myReadChangesCache = null;
myChanges.add(change);
}
@@ -142,9 +124,7 @@ public class LocalChangeListImpl extends LocalChangeList {
for (Change localChange : myChanges) {
if (localChange.equals(change)) {
myChanges.remove(localChange);
if (! myIsInUpdate) {
myReadChangesCache = null;
}
myReadChangesCache = null;
return localChange;
}
}
@@ -155,7 +135,6 @@ public class LocalChangeListImpl extends LocalChangeList {
createReadChangesCache();
final Collection<Change> result = new ArrayList<Change>();
myChangesBeforeUpdate = new ChangeHashSet(myChanges);
myOutdatedChanges = new ArrayList<Change>();
final ExcludedFileIndex fileIndex = ExcludedFileIndex.getInstance(project);
for (Change oldBoy : myChangesBeforeUpdate) {
final ContentRevision before = oldBoy.getBeforeRevision();
@@ -163,14 +142,9 @@ public class LocalChangeListImpl extends LocalChangeList {
if (scope == null || before != null && scope.belongsTo(before.getFile()) || after != null && scope.belongsTo(after.getFile())
|| isIgnoredChange(oldBoy, fileIndex)) {
result.add(oldBoy);
myIsInUpdate = true;
removeChange(oldBoy);
myOutdatedChanges.add(oldBoy);
}
}
if (isDefault()) {
myIsInUpdate = true;
}
return result;
}
@@ -186,44 +160,44 @@ public class LocalChangeListImpl extends LocalChangeList {
}
synchronized boolean processChange(Change change) {
LOG.debug("[process change] for '" + myName + "' isDefault: " + myIsDefault + " change: " +
ChangesUtil.getFilePath(change).getPath());
if (myIsDefault) {
LOG.debug("[process change] adding because default");
addChange(change);
return true;
}
for (Change oldChange : myOutdatedChanges) {
for (Change oldChange : myChangesBeforeUpdate) {
if (Comparing.equal(oldChange, change)) {
LOG.debug("[process change] adding bacuae equal to old: " + ChangesUtil.getFilePath(oldChange).getPath());
addChange(change);
return true;
}
}
LOG.debug("[process change] not found");
return false;
}
synchronized boolean doneProcessingChanges(final List<Change> removedChanges) {
boolean changesDetected = (myChanges.size() != myChangesBeforeUpdate.size());
Change[] newChanges = myChanges.toArray(new Change[myChanges.size()]);
for (int i = 0; i < newChanges.length; i++) {
Change oldChange = findOldChange(newChanges[i]);
if (oldChange != null) {
// or additional info from change descendants will be lost todo: maybe override equals, but then..
// todo: equivalency not <-> to equals there
//newChanges[i] = oldChange;
}
else {
changesDetected = true;
if (! changesDetected) {
for (Change newChange : myChanges) {
Change oldChange = findOldChange(newChange);
if (oldChange == null) {
changesDetected = true;
break;
}
}
}
final List<Change> removed = new ArrayList<Change>(myChangesBeforeUpdate);
// since there are SAME objects...
removed.removeAll(Arrays.asList(newChanges));
removed.removeAll(myChanges);
removedChanges.addAll(removed);
changesDetected = changesDetected || (! removedChanges.isEmpty());
myChanges = new HashSet<Change>(Arrays.asList(newChanges));
myOutdatedChanges = null;
myReadChangesCache = null;
myIsInUpdate = false;
return changesDetected;
}
@@ -276,7 +250,6 @@ public class LocalChangeListImpl extends LocalChangeList {
final LocalChangeListImpl copy = new LocalChangeListImpl(this);
copy.myComment = myComment;
copy.myIsDefault = myIsDefault;
copy.myIsInUpdate = myIsInUpdate;
copy.myIsReadOnly = myIsReadOnly;
if (myChanges != null) {
@@ -287,10 +260,6 @@ public class LocalChangeListImpl extends LocalChangeList {
copy.myChangesBeforeUpdate = new ChangeHashSet(myChangesBeforeUpdate);
}
if (myOutdatedChanges != null) {
copy.myOutdatedChanges = new ArrayList<Change>(myOutdatedChanges);
}
if (myReadChangesCache != null) {
copy.myReadChangesCache = new HashSet<Change>(myReadChangesCache);
}
@@ -300,11 +269,7 @@ public class LocalChangeListImpl extends LocalChangeList {
@Nullable
public ChangeListEditHandler getEditHandler() {
return myEditHandler;
}
public void setEditHandler(final ChangeListEditHandler editHandler) {
myEditHandler = editHandler;
return null;
}
public void setId(String id) {
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UpdatingChangeListBuilder.java
+12 -1
View File
@@ -16,6 +16,7 @@
package com.intellij.openapi.vcs.changes;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.util.Getter;
import com.intellij.openapi.vcs.FilePath;
@@ -26,6 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.Nullable;
class UpdatingChangeListBuilder implements ChangelistBuilder {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.UpdatingChangeListBuilder");
private final ChangeListWorker myChangeListWorker;
private final FileHolderComposite myComposite;
// todo +-
@@ -67,17 +69,26 @@ class UpdatingChangeListBuilder implements ChangelistBuilder {
public void processChangeInList(final Change change, @Nullable final ChangeList changeList, final VcsKey vcsKey) {
checkIfDisposed();
LOG.debug("[processChangeInList-1] entering, cl name: " + ((changeList == null) ? null: changeList.getName()) +
" change: " + ChangesUtil.getFilePath(change).getPath());
final String fileName = ChangesUtil.getFilePath(change).getName();
if (FileTypeManager.getInstance().isFileIgnored(fileName)) return;
if (FileTypeManager.getInstance().isFileIgnored(fileName)) {
LOG.debug("[processChangeInList-1] file type ignored");
return;
}
ApplicationManager.getApplication().runReadAction(new Runnable() {
public void run() {
if (ChangeListManagerImpl.isUnder(change, myScope)) {
if (changeList != null) {
LOG.debug("[processChangeInList-1] to add change to cl");
myChangeListWorker.addChangeToList(changeList.getName(), change, vcsKey);
} else {
LOG.debug("[processChangeInList-1] to add to corresponding list");
myChangeListWorker.addChangeToCorrespondingList(change, vcsKey);
}
} else {
LOG.debug("[processChangeInList-1] not under scope");
}
}
});
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/AlienLocalChangeList.java
-4
View File
@@ -59,10 +59,6 @@ public class AlienLocalChangeList extends LocalChangeList {
return false;
}
public boolean isInUpdate() {
return false;
}
public boolean isReadOnly() {
return false;
}
plugins/git4idea/src/git4idea/changes/GitChangeList.java
-4
View File
@@ -57,10 +57,6 @@ public class GitChangeList extends LocalChangeList {
return true;
}
public boolean isInUpdate() {
return false;
}
public boolean isReadOnly() {
return true;
}