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-40054 (CVS: if file is changed locally first, and then on server, the 'changed on server' marker is not displayed for it - never)

Browse Source
This commit is contained in:
Irina Chernushina
2009-09-10 10:16:10 +04:00
parent c99a0b1e9d
commit 4e82f2203e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/LazyRefreshingSelfQueue.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class LazyRefreshingSelfQueue<T> {
synchronized (myLock) {
for (Pair<Long, T> pair : myQueue) {
if (pair.getFirst() != null) {
onlyAbsolute = pair.getFirst() < startTime;
onlyAbsolute = pair.getFirst() > startTime;
break;
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/RemoteRevisionsCache.java
+5
View File
@@ -170,6 +170,7 @@ public class RemoteRevisionsCache implements PlusMinus<Pair<String, AbstractVcs>
}
public void plus(final Pair<String, AbstractVcs> pair) {
LOG.debug("add " + pair.getFirst());
// does not support
if (pair.getSecond().getDiffProvider() == null) return;
@@ -184,10 +185,12 @@ public class RemoteRevisionsCache implements PlusMinus<Pair<String, AbstractVcs>
synchronized (myLock) {
final Pair<VcsRoot, VcsRevisionNumber> value = myData.get(key);
if (value == null) {
LOG.debug("adding new " + key);
final LazyRefreshingSelfQueue<String> queue = getQueue(vcsRoot);
myData.put(key, new Pair<VcsRoot, VcsRevisionNumber>(vcsRoot, NOT_LOADED));
queue.addRequest(key);
} else if (! value.getFirst().equals(vcsRoot)) {
LOG.debug("switch vcs " + key);
switchVcs(value.getFirst(), vcsRoot, key);
}
}
@@ -213,6 +216,7 @@ public class RemoteRevisionsCache implements PlusMinus<Pair<String, AbstractVcs>
}
public void minus(Pair<String, AbstractVcs> pair) {
LOG.debug("minus " + pair.getFirst());
// does not support
if (pair.getSecond().getDiffProvider() == null) return;
final VirtualFile root = getRootForPath(pair.getFirst());
@@ -221,6 +225,7 @@ public class RemoteRevisionsCache implements PlusMinus<Pair<String, AbstractVcs>
final LazyRefreshingSelfQueue<String> queue;
final String key = pair.getFirst();
synchronized (myLock) {
LOG.debug("removing " + key);
queue = getQueue(new VcsRoot(pair.getSecond(), root));
myData.remove(key);
}