Skip to content

Commit 42a5a3f

Browse files
committed
Honor change-only focus refresh policy
gitx/gitx#201
1 parent 2e9c837 commit 42a5a3f

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

‎Classes/Controllers/PBGitCommitController.m‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@
2828

2929
#define FileChangesTableViewType @"GitFileChangedType"
3030

31+
@interface PBRepositoryRefreshPolicy : NSObject
32+
+ (BOOL)shouldRefreshStatCacheAfterApplicationActivation;
33+
@end
34+
3135
@interface PBGitCommitController () <NSTextViewDelegate, NSMenuDelegate, PBFileChangesTableViewStagingDelegate> {
3236
IBOutlet PBCommitMessageView *commitMessageView;
3337

@@ -141,7 +145,9 @@ - (void)awakeFromNib
141145

142146
- (void)applicationDidBecomeActive:(NSNotification *)notification
143147
{
144-
[self.repository.index refreshStatCache];
148+
if ([PBRepositoryRefreshPolicy shouldRefreshStatCacheAfterApplicationActivation]) {
149+
[self.repository.index refreshStatCache];
150+
}
145151
[self reloadPushRemotes];
146152
}
147153

‎Classes/GitXSwift.swift‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ final class RepositoryRefreshPolicy: NSObject { // swiftlint:disable:this unused
2121
shouldRefreshAfterApplicationActivation(userDefaults: .standard)
2222
}
2323

24+
@objc(shouldRefreshStatCacheAfterApplicationActivation)
25+
static func shouldRefreshStatCacheAfterApplicationActivation() -> Bool { // swiftlint:disable:this unused_declaration
26+
!shouldRefreshAfterApplicationActivation()
27+
}
28+
2429
static func shouldRefreshAfterApplicationActivation(userDefaults: UserDefaults) -> Bool {
2530
userDefaults.bool(forKey: refreshOnApplicationFocusKey)
2631
}

‎GitXTests/RepositoryRefreshCoordinatorTests.m‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ - (void)cancel;
1111

1212
@interface PBRepositoryRefreshPolicy : NSObject
1313
+ (BOOL)shouldRefreshAfterApplicationActivation;
14+
+ (BOOL)shouldRefreshStatCacheAfterApplicationActivation;
1415
@end
1516

1617
@interface PBRepositoryFocusRefreshTracker : NSObject
@@ -141,10 +142,13 @@ - (void)testRefreshOnFocusPolicyIsOptIn
141142

142143
[defaults removeObjectForKey:key];
143144
XCTAssertFalse([PBRepositoryRefreshPolicy shouldRefreshAfterApplicationActivation]);
145+
XCTAssertTrue([PBRepositoryRefreshPolicy shouldRefreshStatCacheAfterApplicationActivation]);
144146
[defaults setBool:YES forKey:key];
145147
XCTAssertTrue([PBRepositoryRefreshPolicy shouldRefreshAfterApplicationActivation]);
148+
XCTAssertFalse([PBRepositoryRefreshPolicy shouldRefreshStatCacheAfterApplicationActivation]);
146149
[defaults setBool:NO forKey:key];
147150
XCTAssertFalse([PBRepositoryRefreshPolicy shouldRefreshAfterApplicationActivation]);
151+
XCTAssertTrue([PBRepositoryRefreshPolicy shouldRefreshStatCacheAfterApplicationActivation]);
148152

149153
if (previousValue) {
150154
[defaults setObject:previousValue forKey:key];

0 commit comments

Comments
 (0)