Skip to content

Commit a2c623b

Browse files
author
David Catmull
committed
delete PBWebStashController
1 parent 50388f5 commit a2c623b

File tree

3 files changed

+194
-40
lines changed

3 files changed

+194
-40
lines changed

‎PBStashContentController.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,9 @@
1515
// Controls the view displaying a stash diff
1616
@interface PBStashContentController : PBViewController {
1717
IBOutlet id webView;
18-
IBOutlet PBWebStashController *webController;
18+
IBOutlet PBWebHistoryController *webController;
1919
}
2020

2121
- (void) showStash:(PBGitStash*)stash;
2222

2323
@end
24-
25-
// TODO: This class may not be needed
26-
@interface PBWebStashController : PBWebHistoryController {
27-
}
28-
29-
@end

‎PBStashContentController.m

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,3 @@ - (void) showStash:(PBGitStash*)stash
2727
}
2828

2929
@end
30-
31-
@implementation PBWebStashController
32-
/*
33-
- (void) changeContentTo:(PBGitStash*)stash
34-
{
35-
if (stash == nil || !finishedLoading)
36-
return;
37-
38-
currentStash = stash;
39-
40-
// TODO: get the stash's SHA and put it in currentSha
41-
42-
NSString *stashRef = [NSString stringWithFormat:@"refs/%@", [stash name]];
43-
NSMutableArray *taskArguments = [NSMutableArray arrayWithObjects:@"show", @"--numstat", @"--summary", @"--pretty=raw", stashRef, nil];
44-
45-
if (![PBGitDefaults showWhitespaceDifferences])
46-
[taskArguments insertObject:@"-w" atIndex:1];
47-
48-
NSFileHandle *handle = [repository handleForArguments:taskArguments];
49-
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
50-
51-
[nc removeObserver:self name:NSFileHandleReadToEndOfFileCompletionNotification object:nil];
52-
[nc addObserver:self selector:@selector(commitDetailsLoaded:) name:NSFileHandleReadToEndOfFileCompletionNotification object:handle];
53-
[handle readToEndOfFileInBackgroundAndNotify];
54-
}
55-
*/
56-
@end

‎PBStashContentView.xib

Lines changed: 193 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<string key="NSClassName">NSView</string>
110110
</object>
111111
<object class="NSCustomObject" id="688478824">
112-
<string key="NSClassName">PBWebStashController</string>
112+
<string key="NSClassName">PBWebHistoryController</string>
113113
</object>
114114
</object>
115115
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -280,6 +280,158 @@
280280
<string key="minorKey">NSApplication+GitXScripting.h</string>
281281
</object>
282282
</object>
283+
<object class="IBPartialClassDescription">
284+
<string key="className">PBGitHistoryController</string>
285+
<string key="superclassName">PBViewController</string>
286+
<object class="NSMutableDictionary" key="actions">
287+
<bool key="EncodedWithXMLCoder">YES</bool>
288+
<object class="NSArray" key="dict.sortedKeys">
289+
<bool key="EncodedWithXMLCoder">YES</bool>
290+
<string>cherryPick:</string>
291+
<string>createBranch:</string>
292+
<string>createTag:</string>
293+
<string>merge:</string>
294+
<string>openFilesAction:</string>
295+
<string>openSelectedFile:</string>
296+
<string>rebase:</string>
297+
<string>refresh:</string>
298+
<string>selectNext:</string>
299+
<string>selectPrevious:</string>
300+
<string>setBranchFilter:</string>
301+
<string>setDetailedView:</string>
302+
<string>setTreeView:</string>
303+
<string>showAddRemoteSheet:</string>
304+
<string>showCommitsFromTree:</string>
305+
<string>showInFinderAction:</string>
306+
<string>toggleQLPreviewPanel:</string>
307+
<string>updateSearch:</string>
308+
</object>
309+
<object class="NSMutableArray" key="dict.values">
310+
<bool key="EncodedWithXMLCoder">YES</bool>
311+
<string>id</string>
312+
<string>id</string>
313+
<string>id</string>
314+
<string>id</string>
315+
<string>id</string>
316+
<string>id</string>
317+
<string>id</string>
318+
<string>id</string>
319+
<string>id</string>
320+
<string>id</string>
321+
<string>id</string>
322+
<string>id</string>
323+
<string>id</string>
324+
<string>id</string>
325+
<string>id</string>
326+
<string>id</string>
327+
<string>id</string>
328+
<string>id</string>
329+
</object>
330+
</object>
331+
<object class="NSMutableDictionary" key="actionInfosByName">
332+
<bool key="EncodedWithXMLCoder">YES</bool>
333+
<object class="NSArray" key="dict.sortedKeys">
334+
<bool key="EncodedWithXMLCoder">YES</bool>
335+
<string>cherryPick:</string>
336+
<string>createBranch:</string>
337+
<string>createTag:</string>
338+
<string>merge:</string>
339+
<string>openFilesAction:</string>
340+
<string>openSelectedFile:</string>
341+
<string>rebase:</string>
342+
<string>refresh:</string>
343+
<string>selectNext:</string>
344+
<string>selectPrevious:</string>
345+
<string>setBranchFilter:</string>
346+
<string>setDetailedView:</string>
347+
<string>setTreeView:</string>
348+
<string>showAddRemoteSheet:</string>
349+
<string>showCommitsFromTree:</string>
350+
<string>showInFinderAction:</string>
351+
<string>toggleQLPreviewPanel:</string>
352+
<string>updateSearch:</string>
353+
</object>
354+
<object class="NSMutableArray" key="dict.values">
355+
<bool key="EncodedWithXMLCoder">YES</bool>
356+
<object class="IBActionInfo">
357+
<string key="name">cherryPick:</string>
358+
<string key="candidateClassName">id</string>
359+
</object>
360+
<object class="IBActionInfo">
361+
<string key="name">createBranch:</string>
362+
<string key="candidateClassName">id</string>
363+
</object>
364+
<object class="IBActionInfo">
365+
<string key="name">createTag:</string>
366+
<string key="candidateClassName">id</string>
367+
</object>
368+
<object class="IBActionInfo">
369+
<string key="name">merge:</string>
370+
<string key="candidateClassName">id</string>
371+
</object>
372+
<object class="IBActionInfo">
373+
<string key="name">openFilesAction:</string>
374+
<string key="candidateClassName">id</string>
375+
</object>
376+
<object class="IBActionInfo">
377+
<string key="name">openSelectedFile:</string>
378+
<string key="candidateClassName">id</string>
379+
</object>
380+
<object class="IBActionInfo">
381+
<string key="name">rebase:</string>
382+
<string key="candidateClassName">id</string>
383+
</object>
384+
<object class="IBActionInfo">
385+
<string key="name">refresh:</string>
386+
<string key="candidateClassName">id</string>
387+
</object>
388+
<object class="IBActionInfo">
389+
<string key="name">selectNext:</string>
390+
<string key="candidateClassName">id</string>
391+
</object>
392+
<object class="IBActionInfo">
393+
<string key="name">selectPrevious:</string>
394+
<string key="candidateClassName">id</string>
395+
</object>
396+
<object class="IBActionInfo">
397+
<string key="name">setBranchFilter:</string>
398+
<string key="candidateClassName">id</string>
399+
</object>
400+
<object class="IBActionInfo">
401+
<string key="name">setDetailedView:</string>
402+
<string key="candidateClassName">id</string>
403+
</object>
404+
<object class="IBActionInfo">
405+
<string key="name">setTreeView:</string>
406+
<string key="candidateClassName">id</string>
407+
</object>
408+
<object class="IBActionInfo">
409+
<string key="name">showAddRemoteSheet:</string>
410+
<string key="candidateClassName">id</string>
411+
</object>
412+
<object class="IBActionInfo">
413+
<string key="name">showCommitsFromTree:</string>
414+
<string key="candidateClassName">id</string>
415+
</object>
416+
<object class="IBActionInfo">
417+
<string key="name">showInFinderAction:</string>
418+
<string key="candidateClassName">id</string>
419+
</object>
420+
<object class="IBActionInfo">
421+
<string key="name">toggleQLPreviewPanel:</string>
422+
<string key="candidateClassName">id</string>
423+
</object>
424+
<object class="IBActionInfo">
425+
<string key="name">updateSearch:</string>
426+
<string key="candidateClassName">id</string>
427+
</object>
428+
</object>
429+
</object>
430+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
431+
<string key="majorKey">IBProjectSource</string>
432+
<string key="minorKey">PBGitHistoryController.h</string>
433+
</object>
434+
</object>
283435
<object class="IBPartialClassDescription">
284436
<string key="className">PBGitRepository</string>
285437
<string key="superclassName">NSDocument</string>
@@ -300,7 +452,7 @@
300452
</object>
301453
<object class="NSMutableArray" key="dict.values">
302454
<bool key="EncodedWithXMLCoder">YES</bool>
303-
<string>PBWebStashController</string>
455+
<string>PBWebHistoryController</string>
304456
<string>id</string>
305457
</object>
306458
</object>
@@ -315,15 +467,15 @@
315467
<bool key="EncodedWithXMLCoder">YES</bool>
316468
<object class="IBToOneOutletInfo">
317469
<string key="name">webController</string>
318-
<string key="candidateClassName">PBWebStashController</string>
470+
<string key="candidateClassName">PBWebHistoryController</string>
319471
</object>
320472
<object class="IBToOneOutletInfo">
321473
<string key="name">webView</string>
322474
<string key="candidateClassName">id</string>
323475
</object>
324476
</object>
325477
</object>
326-
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="675530830">
478+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
327479
<string key="majorKey">IBProjectSource</string>
328480
<string key="minorKey">PBStashContentController.h</string>
329481
</object>
@@ -388,9 +540,44 @@
388540
</object>
389541
</object>
390542
<object class="IBPartialClassDescription">
391-
<string key="className">PBWebStashController</string>
543+
<string key="className">PBWebHistoryController</string>
392544
<string key="superclassName">PBWebController</string>
393-
<reference key="sourceIdentifier" ref="675530830"/>
545+
<object class="NSMutableDictionary" key="outlets">
546+
<bool key="EncodedWithXMLCoder">YES</bool>
547+
<object class="NSArray" key="dict.sortedKeys">
548+
<bool key="EncodedWithXMLCoder">YES</bool>
549+
<string>contextMenuDelegate</string>
550+
<string>historyController</string>
551+
</object>
552+
<object class="NSMutableArray" key="dict.values">
553+
<bool key="EncodedWithXMLCoder">YES</bool>
554+
<string>id</string>
555+
<string>PBGitHistoryController</string>
556+
</object>
557+
</object>
558+
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
559+
<bool key="EncodedWithXMLCoder">YES</bool>
560+
<object class="NSArray" key="dict.sortedKeys">
561+
<bool key="EncodedWithXMLCoder">YES</bool>
562+
<string>contextMenuDelegate</string>
563+
<string>historyController</string>
564+
</object>
565+
<object class="NSMutableArray" key="dict.values">
566+
<bool key="EncodedWithXMLCoder">YES</bool>
567+
<object class="IBToOneOutletInfo">
568+
<string key="name">contextMenuDelegate</string>
569+
<string key="candidateClassName">id</string>
570+
</object>
571+
<object class="IBToOneOutletInfo">
572+
<string key="name">historyController</string>
573+
<string key="candidateClassName">PBGitHistoryController</string>
574+
</object>
575+
</object>
576+
</object>
577+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
578+
<string key="majorKey">IBProjectSource</string>
579+
<string key="minorKey">PBWebHistoryController.h</string>
580+
</object>
394581
</object>
395582
<object class="IBPartialClassDescription">
396583
<string key="className">WebView</string>

0 commit comments

Comments
 (0)