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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-03-30 12:17:13 +04:00
parent e0060e4202 e3dd4dd5d7
commit dd281ebf07
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/repo/GitRepositoryManagerImpl.java
+20 -3
View File
@@ -137,15 +137,32 @@ public class GitRepositoryManagerImpl extends AbstractProjectComponent implement
@Override
public void updateAllRepositories(GitRepository.TrackedTopic... topics) {
for (VirtualFile root : myRepositories.keySet()) {
Map<VirtualFile, GitRepository> repositories;
try {
REPO_LOCK.readLock().lock();
repositories = new HashMap<VirtualFile, GitRepository>(myRepositories);
}
finally {
REPO_LOCK.readLock().unlock();
}
for (VirtualFile root : repositories.keySet()) {
updateRepository(root, topics);
}
}
// note: we are not calling this method during the project startup - it is called anyway by the GitRootTracker
private void updateRepositoriesCollection() {
Map<VirtualFile, GitRepository> repositories = new HashMap<VirtualFile, GitRepository>(myRepositories);
final VirtualFile[] roots = myVcsManager.getRootsUnderVcs(myVcs);
Map<VirtualFile, GitRepository> repositories;
try {
REPO_LOCK.readLock().lock();
repositories = new HashMap<VirtualFile, GitRepository>(myRepositories);
}
finally {
REPO_LOCK.readLock().unlock();
}
final VirtualFile[] roots = myVcsManager.getRootsUnderVcs(myVcs);
// remove repositories that are not in the roots anymore
for (Iterator<Map.Entry<VirtualFile, GitRepository>> iterator = repositories.entrySet().iterator(); iterator.hasNext(); ) {
if (!ArrayUtil.contains(iterator.next().getValue().getRoot(), roots)) {