Skip to content

Commit 9f08ace

Browse files
committed
Refresh repository refs and sidebar coherently
gitx/gitx#404
1 parent c03dc20 commit 9f08ace

5 files changed

Lines changed: 100 additions & 5 deletions

File tree

‎Classes/Controllers/PBGitSidebarController.m‎

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#import "PBSourceViewGitStashItem.h"
1919
#import "PBSidebarTableViewCell.h"
2020
#import "PBGitRef.h"
21+
#import "GitX-Swift.h"
2122

2223
#define PBSidebarCellIdentifier @"PBSidebarCellIdentifier"
2324

@@ -42,6 +43,9 @@ - (PBSourceViewItem *)itemForRev:(PBGitRevSpecifier *)rev;
4243
- (void)removeRevSpec:(PBGitRevSpecifier *)rev;
4344
- (void)updateActionMenu;
4445
- (void)updateRemoteControls;
46+
- (void)reloadSidebarAfterReferencesChange;
47+
48+
@property (nonatomic) PBGitRevSpecifier *lastKnownHeadRef;
4549
@end
4650

4751
@implementation PBGitSidebarController
@@ -69,6 +73,7 @@ - (void)awakeFromNib
6973
[self populateList];
7074

7175
PBGitRepository *repository = self.repository;
76+
self.lastKnownHeadRef = repository.headRef;
7277

7378
[repository addObserver:self
7479
keyPath:@"currentBranch"
@@ -99,6 +104,14 @@ - (void)awakeFromNib
99104
}
100105
}];
101106

107+
[repository addObserver:self
108+
keyPath:@"refs"
109+
options:0
110+
block:^(MAKVONotification *notification) {
111+
PBGitSidebarController *observer = notification.observer;
112+
[observer reloadSidebarAfterReferencesChange];
113+
}];
114+
102115
[repository addObserver:self
103116
keyPath:@"stashes"
104117
options:0
@@ -188,20 +201,56 @@ - (PBSourceViewItem *)addRevSpec:(PBGitRevSpecifier *)rev
188201
return item;
189202

190203
if (![rev isSimpleRef]) {
191-
[others addChild:[PBSourceViewItem itemWithRevSpec:rev]];
204+
item = [PBSourceViewItem itemWithRevSpec:rev];
205+
[others addChild:item];
192206
return item;
193207
}
194208

195209
NSArray *pathComponents = [[rev simpleRef] componentsSeparatedByString:@"/"];
196-
if ([pathComponents count] < 2)
197-
[branches addChild:[PBSourceViewItem itemWithRevSpec:rev]];
210+
if ([pathComponents count] < 2) {
211+
item = [PBSourceViewItem itemWithRevSpec:rev];
212+
[branches addChild:item];
213+
}
198214
else if ([[pathComponents objectAtIndex:1] isEqualToString:@"heads"])
199215
[branches addRev:rev toPath:[pathComponents subarrayWithRange:NSMakeRange(2, [pathComponents count] - 2)]];
200216
else if ([[rev simpleRef] hasPrefix:@"refs/tags/"])
201217
[tags addRev:rev toPath:[pathComponents subarrayWithRange:NSMakeRange(2, [pathComponents count] - 2)]];
202218
else if ([[rev simpleRef] hasPrefix:@"refs/remotes/"])
203219
[remotes addRev:rev toPath:[pathComponents subarrayWithRange:NSMakeRange(2, [pathComponents count] - 2)]];
204-
return item;
220+
return item ?: [self itemForRev:rev];
221+
}
222+
223+
- (void)reloadSidebarAfterReferencesChange
224+
{
225+
BOOL stageSelected = [PBGitDefaults showStageView];
226+
PBGitRevSpecifier *viewedRev = self.repository.currentBranch;
227+
PBGitRevSpecifier *newHead = self.repository.headRef;
228+
BOOL followHead = [PBHistoryRefreshSelectionPolicy shouldFollowCheckedOutBranchWithStageSelected:stageSelected
229+
viewedRef:viewedRev.simpleRef
230+
previousHeadRef:self.lastKnownHeadRef.simpleRef];
231+
if (followHead && newHead && ![viewedRev isEqual:newHead]) {
232+
self.repository.currentBranch = newHead;
233+
viewedRev = newHead;
234+
}
235+
236+
[sourceView reloadData];
237+
[sourceView expandItem:items.firstObject];
238+
[sourceView expandItem:branches expandChildren:YES];
239+
[sourceView expandItem:remotes];
240+
if (stageSelected) {
241+
[self selectStage];
242+
} else {
243+
PBSourceViewItem *item = [self itemForRev:viewedRev];
244+
if (item) {
245+
[sourceView PBExpandItem:item expandParents:YES];
246+
[sourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:[sourceView rowForItem:item]] byExtendingSelection:NO];
247+
}
248+
}
249+
250+
NSLog(@"[GitX] Refreshed sidebar refs: HEAD %@ -> %@, followed=%@, stage=%@",
251+
self.lastKnownHeadRef.simpleRef ?: @"(none)", newHead.simpleRef ?: @"(none)",
252+
followHead ? @"yes" : @"no", stageSelected ? @"yes" : @"no");
253+
self.lastKnownHeadRef = newHead;
205254
}
206255

207256
- (void)removeRevSpec:(PBGitRevSpecifier *)rev

‎Classes/GitXSwift.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,16 @@ final class RepositoryFocusRefreshTracker: NSObject { // swiftlint:disable:this
4848
previousSnapshotComponents = nil
4949
}
5050
}
51+
52+
/// Decides whether a refs refresh should keep following the checked-out branch.
53+
@objc(PBHistoryRefreshSelectionPolicy)
54+
final class HistoryRefreshSelectionPolicy: NSObject { // swiftlint:disable:this unused_declaration
55+
@objc(shouldFollowCheckedOutBranchWithStageSelected:viewedRef:previousHeadRef:)
56+
static func shouldFollowCheckedOutBranch(
57+
stageSelected: Bool,
58+
viewedRef: String?,
59+
previousHeadRef: String?
60+
) -> Bool { // swiftlint:disable:this unused_declaration
61+
!stageSelected && viewedRef != nil && viewedRef == previousHeadRef
62+
}
63+
}

‎Classes/git/PBGitHistoryList.m‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,12 @@ - (void)dealloc
6262

6363
- (void)forceUpdate
6464
{
65-
if ([repository.currentBranch isSimpleRef])
65+
if ([repository.currentBranch isSimpleRef]) {
6666
shouldReloadProjectHistory = YES;
67+
} else {
68+
NSLog(@"[GitX] Manual history refresh reloading refs for a complex revision");
69+
[repository reloadRefs];
70+
}
6771

6872
[self updateHistory];
6973
}

‎GitXTests/GitXCoreTests.m‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,22 @@ - (void)testManualRevisionRefreshReloadsExternallyChangedHeadAndBranches
291291
XCTAssertEqualObjects(self.repository.currentBranch.simpleRef, @"refs/heads/main");
292292
}
293293

294+
- (void)testManualRevisionRefreshReloadsRefsWhileViewingComplexRevision
295+
{
296+
NSError *error = nil;
297+
self.repository.currentBranch = [[PBGitRevSpecifier alloc] initWithParameters:@[ @"HEAD~0" ]];
298+
XCTAssertFalse(self.repository.currentBranch.isSimpleRef);
299+
XCTAssertEqualObjects(self.repository.headRef.simpleRef, @"refs/heads/main");
300+
XCTAssertNil([self.repository refForName:@"feature/complex-refresh"]);
301+
XCTAssertNotNil(([self.fixture git:@[ @"checkout", @"--quiet", @"-b", @"feature/complex-refresh" ] error:&error]), @"%@", error);
302+
303+
[self.repository forceUpdateRevisions];
304+
305+
XCTAssertEqualObjects(self.repository.headRef.simpleRef, @"refs/heads/feature/complex-refresh");
306+
XCTAssertNotNil([self.repository refForName:@"feature/complex-refresh"]);
307+
XCTAssertFalse(self.repository.currentBranch.isSimpleRef);
308+
}
309+
294310
- (void)testRemoteDiscoveryUsesLocalFixture
295311
{
296312
NSError *error = nil;

‎GitXTests/GitXFeatureTests.m‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,19 @@ - (void)testContextClickSelectsOnlyAnUnselectedCommit
201201
XCTAssertFalse(shouldReplaceSelection(commitListClass, selector, -1, selected));
202202
}
203203

204+
- (void)testHistoryRefreshFollowsHeadOnlyWhenItWasAlreadyViewed
205+
{
206+
Class policyClass = NSClassFromString(@"PBHistoryRefreshSelectionPolicy");
207+
XCTAssertNotNil(policyClass);
208+
SEL selector = NSSelectorFromString(@"shouldFollowCheckedOutBranchWithStageSelected:viewedRef:previousHeadRef:");
209+
XCTAssertTrue([policyClass respondsToSelector:selector]);
210+
BOOL (*shouldFollowHead)(id, SEL, BOOL, NSString *, NSString *) = (void *)objc_msgSend;
211+
XCTAssertTrue(shouldFollowHead(policyClass, selector, NO, @"refs/heads/main", @"refs/heads/main"));
212+
XCTAssertFalse(shouldFollowHead(policyClass, selector, YES, @"refs/heads/main", @"refs/heads/main"));
213+
XCTAssertFalse(shouldFollowHead(policyClass, selector, NO, @"refs/heads/topic", @"refs/heads/main"));
214+
XCTAssertFalse(shouldFollowHead(policyClass, selector, NO, nil, @"refs/heads/main"));
215+
}
216+
204217
- (void)testDisablingHistorySortingClearsNewDescriptors
205218
{
206219
PBHistoryArrayController *controller = [[PBHistoryArrayController alloc] initWithContent:@[]];

0 commit comments

Comments
 (0)