github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tweak how we throttle fetching SCM status

Browse Source 
When we observe a change on disk we will fetch status after 0.5 seconds if we are active, otherwise 3 seconds.

If we become active and have a pending update, we update immediately.

The reason for the delay is that the change on disk could be the version control system working, for example performing a rebase, and not all systems can gracefully handle requesting status when in the midst of such operation.
This commit is contained in:
Allan Odgaard
2018-10-29 20:51:09 +07:00
parent 045fd33497
commit bad84bd511
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Frameworks/FileBrowser/src/SCMManager.h
View File

@@ -4,6 +4,7 @@
@property (nonatomic, readonly) NSURL* URL;
@property (nonatomic, readonly) BOOL enabled;
@property (nonatomic, readonly) BOOL tracksDirectories;
@property (nonatomic, readonly) BOOL hasStatus;
@property (nonatomic, readonly) std::map<std::string, scm::status::type> status;
@property (nonatomic, readonly) std::map<std::string, std::string> variables;
@end

33
Frameworks/FileBrowser/src/SCMManager.mm
View File

@@ -18,12 +18,12 @@ namespace scm
BOOL _needsUpdate;
BOOL _updating;
NSTimer* _updateTimer;
NSDate* _noUpdateBefore;
}
@property (nonatomic, readwrite) std::map<std::string, scm::status::type> status;
@property (nonatomic, readwrite) std::map<std::string, std::string> variables;
@property (nonatomic, readonly) scm::driver_t const* driver;
@property (nonatomic, readonly) NSMutableArray<SCMRepositoryObserver*>* observers;
@property (nonatomic) NSDate* lastUpdate;
@property (nonatomic) id fsEventsObserver;
- (instancetype)initWithURL:(NSURL*)url driver:(scm::driver_t const*)driver;
- (scm::status::type)SCMStatusForURL:(NSURL*)url;
@@ -106,6 +106,7 @@ namespace scm
_driver = driver;
_enabled = scm::scm_enabled_for_path(url.fileSystemRepresentation);
_tracksDirectories = driver && driver->tracks_directories();
_noUpdateBefore = [NSDate distantPast];
_observers = [NSMutableArray array];
if(_enabled == YES)
@@ -114,28 +115,41 @@ namespace scm
__weak SCMRepository* weakSelf = self;
_fsEventsObserver = [FSEventsManager.sharedInstance addObserverToDirectoryAtURL:url observeSubdirectories:YES usingBlock:^(NSURL* url){
_noUpdateBefore = [_noUpdateBefore laterDate:[NSDate dateWithTimeIntervalSinceNow:NSApp.isActive ? 0.5 : 3]];
[weakSelf tryUpdateStatusInBackground];
}];
}
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(applicationDidBecomeActive:) name:NSApplicationDidBecomeActiveNotification object:NSApp];
}
return self;
}
- (void)dealloc
{
[NSNotificationCenter.defaultCenter removeObserver:self name:NSApplicationDidBecomeActiveNotification object:NSApp];
[FSEventsManager.sharedInstance removeObserver:_fsEventsObserver];
}
- (void)applicationDidBecomeActive:(NSNotification*)aNotification
{
if(_updateTimer)
[self updateStatusInBackground:nil];
}
- (void)tryUpdateStatusInBackground
{
if(_updating)
{
_needsUpdate = YES;
return;
}
else if(_lastUpdate && [[NSDate date] timeIntervalSinceDate:_lastUpdate] < 1.5)
NSTimeInterval delayUpdate = [_noUpdateBefore timeIntervalSinceNow];
if(delayUpdate > 0)
{
if(!_updateTimer)
_updateTimer = [NSTimer scheduledTimerWithTimeInterval:1.5 - [[NSDate date] timeIntervalSinceDate:_lastUpdate] target:self selector:@selector(updateStatusInBackground:) userInfo:nil repeats:NO];
[_updateTimer invalidate];
_updateTimer = [NSTimer scheduledTimerWithTimeInterval:delayUpdate target:self selector:@selector(updateStatusInBackground:) userInfo:nil repeats:NO];
}
else
{
@@ -168,19 +182,20 @@ namespace scm
{
_status = status;
_variables = variables;
_hasStatus = YES;
for(SCMRepositoryObserver* observer in [_observers copy])
observer.handler(self);
_updating = NO;
_lastUpdate = [NSDate date];
_updating = NO;
_noUpdateBefore = [_noUpdateBefore laterDate:[NSDate dateWithTimeIntervalSinceNow:1.5]];
if(_needsUpdate)
[self tryUpdateStatusInBackground];
}
- (scm::status::type)SCMStatusForURL:(NSURL*)url
{
if(_lastUpdate)
if(_hasStatus)
{
auto it = _status.find(url.fileSystemRepresentation);
if(it != _status.end())
@@ -195,7 +210,7 @@ namespace scm
observer.repository = self;
[_observers addObject:observer];
if(_lastUpdate)
if(_hasStatus)
handler(self);
return observer;
@@ -237,7 +252,7 @@ namespace scm
observer.directory = self;
[_observers addObject:observer];
if(_repository && _repository.lastUpdate)
if(_repository.hasStatus)
handler(_repository);
return observer;