Merge pull request #189 from jphalip/master

laullon · laullon · commit a9b285766040 · 2012-05-31T11:15:53.000-07:00
Multiple performance and UI improvements
diff --git a/English.lproj/PBCreateTagSheet.xib b/English.lproj/PBCreateTagSheet.xib
diff --git a/GLFileView.m b/GLFileView.m
@@ -550,6 +550,8 @@ - (NSString *) parseBlame:(NSString *)txt
     NSMutableDictionary *headers=[NSMutableDictionary dictionary];
     NSMutableString *res=[NSMutableString string];
     
+    NSDateFormatter* dateFormatter = [[NSDateFormatter alloc] initWithDateFormat:@"%Y-%m-%d %H:%M:%S" allowNaturalLanguage:NO];
+    
     [res appendString:@"<table class='blocks'>\n"];
     int i=0;
     while(i<[lines count]){
@@ -561,12 +563,32 @@ - (NSString *) parseBlame:(NSString *)txt
             [res appendFormat:@"<tr class='block l%d'>\n",nLines];
             line=[lines objectAtIndex:++i];
             if([[[line componentsSeparatedByString:@" "] objectAtIndex:0] isEqual:@"author"]){
-                NSString *author=[line stringByReplacingOccurrencesOfString:@"author" withString:@""];
+                NSString *author=[line stringByReplacingOccurrencesOfString:@"author " withString:@""];
+                
+                NSString *timestamp=nil;
+                while(timestamp==nil){
+                    line=[lines objectAtIndex:i++];
+                    if([[[line componentsSeparatedByString:@" "] objectAtIndex:0] isEqual:@"author-time"]){
+                        timestamp=[line stringByReplacingOccurrencesOfString:@"author-time " withString:@""];
+                    }
+                }
+
+                NSString *timezone=nil;
+                while(timezone==nil){
+                    line=[lines objectAtIndex:i++];
+                    if([[[line componentsSeparatedByString:@" "] objectAtIndex:0] isEqual:@"author-tz"]){
+                        timezone=[line stringByReplacingOccurrencesOfString:@"author-tz " withString:@""];
+                    }
+                }
+                
+                NSDate *date = [NSDate dateWithTimeIntervalSince1970:[timestamp doubleValue]];
+                NSString *dateString = [NSString stringWithFormat:@"%@ %@",[dateFormatter stringFromDate: date],timezone];
+                
                 NSString *summary=nil;
                 while(summary==nil){
                     line=[lines objectAtIndex:i++];
                     if([[[line componentsSeparatedByString:@" "] objectAtIndex:0] isEqual:@"summary"]){
-                        summary=[line stringByReplacingOccurrencesOfString:@"summary" withString:@""];
+                        summary=[line stringByReplacingOccurrencesOfString:@"summary " withString:@""];
                     }
                 }
                 NSRange trunc_c={0,7};
@@ -583,7 +605,8 @@ - (NSString *) parseBlame:(NSString *)txt
                 if([summary length]>30){
                     truncate_s=[summary substringWithRange:trunc];
                 }
-                NSString *block=[NSString stringWithFormat:@"<td><p class='author'><a href='' onclick='selectCommit(\"%@\"); return false;'>%@</a> %@</p><p class='summary'>%@</p></td>\n<td>\n",commitID,truncate_c,truncate_a,truncate_s];
+                NSString *tooltip = [NSString stringWithFormat:@"%@\nAuthor: %@\nDate: %@\n\n%@",commitID,author,dateString,summary];
+                NSString *block=[NSString stringWithFormat:@"<td><p class='author'><a title='%@' href='' onclick='selectCommit(\"%@\"); return false;'>%@</a> %@</p><p class='summary'>%@</p></td>\n<td>\n",tooltip,commitID,truncate_c,truncate_a,truncate_s];
                 [headers setObject:block forKey:[header objectAtIndex:0]];
             }
             [res appendString:[headers objectForKey:[header objectAtIndex:0]]];
@@ -703,7 +726,7 @@ - (NSString *)numberOfMatchesString
 
 - (void) updateSearch
 {
-    [view search:searchField update:YES direction:YES];
+    [view search:searchField update:YES grabFocus:NO direction:YES];
     [self updateSearchUI];
 }
 
@@ -725,7 +748,7 @@ - (IBAction)searchFieldChanged:(id)sender
 {
     BOOL update=[[searchField stringValue] isEqualToString:searchString]? NO: YES;
     searchString=[searchField stringValue];
-    [view search:searchField update:update direction:YES];
+    [view search:searchField update:update grabFocus:YES direction:YES];
     [self updateSearchUI];
 }
 
@@ -734,9 +757,9 @@ - (IBAction)stepperPressed:(id)sender {
     NSInteger selectedSegment = [sender selectedSegment];
     
 	if (selectedSegment == 0)
-        [view search:searchField update:NO direction:NO];
+        [view search:searchField update:NO grabFocus:YES direction:NO];
 	else
-		[view search:searchField update:NO direction:YES];
+		[view search:searchField update:NO grabFocus:YES direction:YES];
 }
 
 @end
diff --git a/PBCreateTagSheet.h b/PBCreateTagSheet.h
@@ -34,5 +34,6 @@
 @property (strong) IBOutlet NSTextField *tagNameField;
 @property (strong) IBOutlet NSTextView  *tagMessageText;
 @property (strong) IBOutlet NSTextField *errorMessageField;
+@property (assign) BOOL replaceExisting;
 
 @end
diff --git a/PBCreateTagSheet.m b/PBCreateTagSheet.m
@@ -26,6 +26,7 @@ @implementation PBCreateTagSheet
 @synthesize tagNameField;
 @synthesize tagMessageText;
 @synthesize errorMessageField;
+@synthesize replaceExisting;
 
 static PBCreateTagSheet *sheet;
 
@@ -69,13 +70,13 @@ - (IBAction) createTag:(id)sender
 	}
     
     NSString *refExistsReturnMessage;
-    if([self.repository refExists:ref checkOnRemotesWithoutBranches:NO resultMessage:&refExistsReturnMessage])
+    if(!self.replaceExisting && [self.repository refExists:ref checkOnRemotesWithoutBranches:NO resultMessage:&refExistsReturnMessage])
     {
         NSError  *error = [NSError errorWithDomain:PBGitRepositoryErrorDomain 
                                               code:0
                                           userInfo:[NSDictionary dictionaryWithObjectsAndKeys:
                                                     refExistsReturnMessage, NSLocalizedDescriptionKey,
-                                                    @"Select other tagname.", NSLocalizedRecoverySuggestionErrorKey,
+                                                    @"Enter another tag name.", NSLocalizedRecoverySuggestionErrorKey,
                                                     nil]
                            ];
         [[NSAlert alertWithError:error]runModal];
@@ -89,7 +90,7 @@ - (IBAction) createTag:(id)sender
                                                 defaultButton:@"Yes"
                                               alternateButton:@"No"
                                                   otherButton:nil
-                                    informativeTextWithFormat:@"Still want to create the %@ %@?",[ref refishType],[ref shortName]] runModal];
+                                    informativeTextWithFormat:@"Do you still want to create the %@ %@?",[ref refishType],[ref shortName]] runModal];
             
             if (returnButton == NSAlertAlternateReturn)
             {
@@ -101,7 +102,7 @@ - (IBAction) createTag:(id)sender
 	[self closeCreateTagSheet:sender];
 
 	NSString *message = [self.tagMessageText string];
-	[self.repository createTag:tagName message:message atRefish:self.targetRefish];
+	[self.repository createTag:tagName message:message atRefish:self.targetRefish force:self.replaceExisting];
 }
 
 
diff --git a/PBGitRepository.h b/PBGitRepository.h
@@ -80,7 +80,7 @@ dispatch_queue_t PBGetWorkQueue();
 - (BOOL) rebaseBranch:(id <PBGitRefish>)branch onRefish:(id <PBGitRefish>)upstream;
 - (BOOL) renameRef:(PBGitRef*)ref withNewName:(NSString *)newName;
 - (BOOL) createBranch:(NSString *)branchName atRefish:(id <PBGitRefish>)ref;
-- (BOOL) createTag:(NSString *)tagName message:(NSString *)message atRefish:(id <PBGitRefish>)commitSHA;
+- (BOOL) createTag:(NSString *)tagName message:(NSString *)message atRefish:(id <PBGitRefish>)commitSHA force:(BOOL)force;
 - (BOOL) deleteRemote:(PBGitRef *)ref;
 - (BOOL) isRemoteConnected:(NSString*)remoteName;
 - (BOOL) deleteRemoteBranch:(PBGitRef *)ref;
diff --git a/PBGitRepository.m b/PBGitRepository.m
@@ -186,13 +186,13 @@ - (void) setup
 {
 	config = [[PBGitConfig alloc] initWithRepositoryPath:[[self fileURL] path]];
 	self.branches = [NSMutableArray array];
-	[self reloadRefs];
 	currentBranchFilter = [PBGitDefaults branchFilter];
 	revisionList = [[PBGitHistoryList alloc] initWithRepository:self];
-	
 	resetController = [[PBGitResetController alloc] initWithRepository:self];
 	stashController = [[PBStashController alloc] initWithRepository:self];
 	submoduleController = [[PBSubmoduleController alloc] initWithRepository:self];
+    [self reloadRefs];
+    [self readCurrentBranch];
 }
 
 - (void)close
@@ -614,7 +614,7 @@ - (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteChec
     {
         if (result)
         {
-            *result = [NSString stringWithFormat:@"%@ exists already local as branch!",refShortName];
+            *result = [NSString stringWithFormat:@"%@ already exists as local branch!",refShortName];
         }
         return YES;
     }
@@ -626,7 +626,7 @@ - (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteChec
     {
         if (result)
         {
-            *result = [NSString stringWithFormat:@"%@ exists already local as tag!",refShortName];
+            *result = [NSString stringWithFormat:@"%@ already exists as local tag!",refShortName];
         }
         return YES;
     }
@@ -637,7 +637,7 @@ - (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteChec
     {
         if (result)
         {
-            *result = [NSString stringWithFormat:@"%@ exists already local as remotename!",refShortName];
+            *result = [NSString stringWithFormat:@"%@ already exists as remote reference!",refShortName];
         }
         return YES;
     }
@@ -1428,7 +1428,7 @@ - (BOOL) renameRef:(PBGitRef*)ref withNewName:(NSString *)newName;
     return retValue;
 }
 
-- (BOOL) createTag:(NSString *)tagName message:(NSString *)message atRefish:(id <PBGitRefish>)target
+- (BOOL) createTag:(NSString *)tagName message:(NSString *)message atRefish:(id <PBGitRefish>)target force:(BOOL)force
 {
 	if (!tagName)
 		return NO;
@@ -1441,6 +1441,10 @@ - (BOOL) createTag:(NSString *)tagName message:(NSString *)message atRefish:(id
 		[arguments addObject:[@"-m" stringByAppendingString:message]];
 	}
 
+    if (force) {
+        [arguments addObject:@"-f"];
+    }
+    
 	[arguments addObject:tagName];
 
 	// if no refish then git will add it to HEAD
diff --git a/PBGitSidebarController.h b/PBGitSidebarController.h
@@ -46,7 +46,7 @@
 
 - (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode;
 
--(NSNumber *)countCommintsOf:(NSString *)range;
+-(NSNumber *)countCommitsOf:(NSString *)range;
 -(bool)remoteNeedFetch:(NSString *)remote;
 
 @property(strong, readonly) NSMutableArray *items;
diff --git a/PBGitSidebarController.m b/PBGitSidebarController.m
@@ -84,6 +84,7 @@ - (void)awakeFromNib
 	
 	[sourceView setDoubleAction:@selector(outlineDoubleClicked)];
 	[sourceView setTarget:self];
+    [self updateMetaDataForBranches];
 }
 
 - (void)closeView
@@ -162,33 +163,36 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 		for(PBGitSVRemoteItem* remote in [remotes children]){
 			[self performSelectorInBackground:@selector(evaluateRemoteBadge:) withObject:remote];
 		}
-		
-		[self updateMetaDataforBranches:branches];
+		[self updateMetaDataForBranches];
 	}else{
 		[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
 	}
 }
 
 
--(void)updateMetaDataforBranches:(PBSourceViewItem *)theBranches
+-(void)updateMetaDataForBranches:(PBSourceViewItem *)theBranches
 {
     for(PBGitSVBranchItem* branch in [theBranches children]){
         if([branch isKindOfClass:[PBGitSVBranchItem class]]){
             dispatch_async(PBGetWorkQueue(),^{
-                id ahead = [self countCommintsOf:[NSString stringWithFormat:@"origin/%@..%@",branch.revSpecifier,branch.revSpecifier]]; 
-                id behind = [self countCommintsOf:[NSString stringWithFormat:@"%@..origin/%@",branch.revSpecifier,branch.revSpecifier]];
+                id ahead = [self countCommitsOf:[NSString stringWithFormat:@"origin/%@..%@",branch.revSpecifier,branch.revSpecifier]]; 
+                id behind = [self countCommitsOf:[NSString stringWithFormat:@"%@..origin/%@",branch.revSpecifier,branch.revSpecifier]];
                 dispatch_async(dispatch_get_main_queue(),^{
                     [branch setAhead:ahead];
                     [branch setBehind:behind];
                     [branch setIsCheckedOut:[branch.revSpecifier isEqual:[repository headRef]]];
                 });
             });
         }else if ([branch isKindOfClass:[PBGitSVFolderItem class]]) {
-            [self updateMetaDataforBranches: branch];
+            [self updateMetaDataForBranches: branch];
         }
     }
 }
 
+-(void)updateMetaDataForBranches
+{
+    [self updateMetaDataForBranches: branches];
+}
 
 #pragma mark Badges Methods
 
@@ -205,7 +209,7 @@ -(void)evaluateRemoteBadge:(PBGitSVRemoteItem *)remote
 	}
 }
 
--(NSNumber *)countCommintsOf:(NSString *)range
+-(NSNumber *)countCommitsOf:(NSString *)range
 {
 	NSArray *args = [NSArray arrayWithObjects:@"rev-list", range, nil];
 	int ret;
diff --git a/PBGitWindowController.m b/PBGitWindowController.m
@@ -135,7 +135,6 @@ - (void) changeContentController:(PBViewController *)controller
     
 	[self setNextResponder: contentController];
 	[[self window] makeFirstResponder:[contentController firstResponder]];
-	[contentController updateView];
 	[contentController addObserver:self forKeyPath:@"status" options:NSKeyValueObservingOptionInitial context:@"statusChange"];
 }
 
diff --git a/PBRefMenuItem.m b/PBRefMenuItem.m
@@ -60,7 +60,7 @@ + (NSArray *) defaultMenuItemsForRef:(PBGitRef *)ref inRepository:(PBGitReposito
 		[items addObject:[PBRefMenuItem itemWithTitle:checkoutTitle action:@selector(checkout:) enabled:!isHead]];
 		[items addObject:[PBRefMenuItem separatorItem]];
 
-        NSString *resetTitle = [NSString stringWithFormat:@"Reset %@ to %@", headRefName, targetRefName];
+        NSString *resetTitle = [NSString stringWithFormat:@"Reset %@ to %@…", headRefName, targetRefName];
         [items addObject:[PBRefMenuItem itemWithTitle: resetTitle action:@selector(reset:) enabled:YES]];
         [items addObject:[PBRefMenuItem separatorItem]];       
         
@@ -172,7 +172,7 @@ + (NSArray *) defaultMenuItemsForCommit:(PBGitCommit *)commit target:(id)target
 	[items addObject:[PBRefMenuItem itemWithTitle:@"Checkout Commit" action:@selector(checkout:) enabled:YES]];
 	[items addObject:[PBRefMenuItem separatorItem]];
     
-    NSString *resetTitle = [NSString stringWithFormat:@"Reset %@ to here", headBranchName];
+    NSString *resetTitle = [NSString stringWithFormat:@"Reset %@ to here…", headBranchName];
     [items addObject:[PBRefMenuItem itemWithTitle: resetTitle action:@selector(reset:) enabled:YES]];
 	[items addObject:[PBRefMenuItem separatorItem]];
 
diff --git a/SearchWebView.h b/SearchWebView.h
@@ -16,6 +16,6 @@
 - (void)highlightAllOccurencesOfString:(NSString*)str direction:(BOOL)forward;
 - (void)highlightAllOccurencesOfString:(NSString*)str inNode:(DOMNode *)node;
 - (void)removeAllHighlights;
-- (void)search:(NSSearchField *)sender update:(BOOL)update direction:(BOOL)forward;
+- (void)search:(NSSearchField *)sender update:(BOOL)update grabFocus:(BOOL)grabFocus direction:(BOOL)forward;
 
 @end
diff --git a/SearchWebView.m b/SearchWebView.m
@@ -68,21 +68,26 @@ - (void)highlightAllOccurencesOfString:(NSString*)str update:(BOOL)update direct
     }
 }
 
-- (void)search:(NSSearchField *)sender update:(BOOL)update direction:(BOOL)forward
+- (void)search:(NSSearchField *)sender update:(BOOL)update grabFocus:(BOOL)grabFocus direction:(BOOL)forward
 {
     NSString *searchString = [sender stringValue];
         
     DLog(@"searchString:%@",searchString);
-       
-    // Back-up the search field's caret position so we can restore it later
-    NSRange searchFieldSelectedRange = [[sender currentEditor] selectedRange];
+    
+    NSRange searchFieldSelectedRange;
+    if (grabFocus) {
+        // Back-up the search field's caret position so we can restore it later
+        searchFieldSelectedRange = [[sender currentEditor] selectedRange];
+    }
     
     if([searchString length]>0){
         [self highlightAllOccurencesOfString:searchString update:update direction:forward];
         
-        // Bring the search field back in focus and restore its caret position
-        [[sender window] makeFirstResponder:sender];
-        [[sender currentEditor] setSelectedRange:searchFieldSelectedRange];
+        if (grabFocus) {
+            // Bring the search field back in focus and restore its caret position
+            [[sender window] makeFirstResponder:sender];
+            [[sender currentEditor] setSelectedRange:searchFieldSelectedRange];
+        }
         
         if(result!=nil) {
             [self setSelectedDOMRange:result affinity:NSSelectionAffinityDownstream];

Original file line number	Diff line number	Diff line change
`@@ -186,13 +186,13 @@ - (void) setup`
`186`	`186`	`{`
`187`	`187`	`config = [[PBGitConfig alloc] initWithRepositoryPath:[[self fileURL] path]];`
`188`	`188`	`self.branches = [NSMutableArray array];`
`189`		`- [self reloadRefs];`
`190`	`189`	`currentBranchFilter = [PBGitDefaults branchFilter];`
`191`	`190`	`revisionList = [[PBGitHistoryList alloc] initWithRepository:self];`
`192`		`-`
`193`	`191`	`resetController = [[PBGitResetController alloc] initWithRepository:self];`
`194`	`192`	`stashController = [[PBStashController alloc] initWithRepository:self];`
`195`	`193`	`submoduleController = [[PBSubmoduleController alloc] initWithRepository:self];`
	`194`	`+ [self reloadRefs];`
	`195`	`+ [self readCurrentBranch];`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`- (void)close`
`@@ -614,7 +614,7 @@ - (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteChec`
`614`	`614`	`{`
`615`	`615`	`if (result)`
`616`	`616`	`{`
`617`		`- *result = [NSString stringWithFormat:@"%@ exists already local as branch!",refShortName];`
	`617`	`+ *result = [NSString stringWithFormat:@"%@ already exists as local branch!",refShortName];`
`618`	`618`	`}`
`619`	`619`	`return YES;`
`620`	`620`	`}`
`@@ -626,7 +626,7 @@ - (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteChec`
`626`	`626`	`{`
`627`	`627`	`if (result)`
`628`	`628`	`{`
`629`		`- *result = [NSString stringWithFormat:@"%@ exists already local as tag!",refShortName];`
	`629`	`+ *result = [NSString stringWithFormat:@"%@ already exists as local tag!",refShortName];`
`630`	`630`	`}`
`631`	`631`	`return YES;`
`632`	`632`	`}`
`@@ -637,7 +637,7 @@ - (BOOL)refExists:(PBGitRef *)ref checkOnRemotesWithoutBranches:(BOOL)remoteChec`
`637`	`637`	`{`
`638`	`638`	`if (result)`
`639`	`639`	`{`
`640`		`- *result = [NSString stringWithFormat:@"%@ exists already local as remotename!",refShortName];`
	`640`	`+ *result = [NSString stringWithFormat:@"%@ already exists as remote reference!",refShortName];`
`641`	`641`	`}`
`642`	`642`	`return YES;`
`643`	`643`	`}`
`@@ -1428,7 +1428,7 @@ - (BOOL) renameRef:(PBGitRef)ref withNewName:(NSString )newName;`
`1428`	`1428`	`return retValue;`
`1429`	`1429`	`}`
`1430`	`1430`
`1431`		`-- (BOOL) createTag:(NSString )tagName message:(NSString )message atRefish:(id <PBGitRefish>)target`
	`1431`	`+- (BOOL) createTag:(NSString )tagName message:(NSString )message atRefish:(id <PBGitRefish>)target force:(BOOL)force`
`1432`	`1432`	`{`
`1433`	`1433`	`if (!tagName)`
`1434`	`1434`	`return NO;`
`@@ -1441,6 +1441,10 @@ - (BOOL) createTag:(NSString )tagName message:(NSString )message atRefish:(id`
`1441`	`1441`	`[arguments addObject:[@"-m" stringByAppendingString:message]];`
`1442`	`1442`	`}`
`1443`	`1443`
	`1444`	`+ if (force) {`
	`1445`	`+ [arguments addObject:@"-f"];`
	`1446`	`+ }`
	`1447`	`+`
`1444`	`1448`	`[arguments addObject:tagName];`
`1445`	`1449`
`1446`	`1450`	`// if no refish then git will add it to HEAD`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ - (void)awakeFromNib`
`84`	`84`
`85`	`85`	`[sourceView setDoubleAction:@selector(outlineDoubleClicked)];`
`86`	`86`	`[sourceView setTarget:self];`
	`87`	`+ [self updateMetaDataForBranches];`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`- (void)closeView`
`@@ -162,33 +163,36 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(`
`162`	`163`	`for(PBGitSVRemoteItem* remote in [remotes children]){`
`163`	`164`	`[self performSelectorInBackground:@selector(evaluateRemoteBadge:) withObject:remote];`
`164`	`165`	`}`
`165`		`-`
`166`		`- [self updateMetaDataforBranches:branches];`
	`166`	`+ [self updateMetaDataForBranches];`
`167`	`167`	`}else{`
`168`	`168`	`[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`172`	`172`
`173`		`--(void)updateMetaDataforBranches:(PBSourceViewItem *)theBranches`
	`173`	`+-(void)updateMetaDataForBranches:(PBSourceViewItem *)theBranches`
`174`	`174`	`{`
`175`	`175`	`for(PBGitSVBranchItem* branch in [theBranches children]){`
`176`	`176`	`if([branch isKindOfClass:[PBGitSVBranchItem class]]){`
`177`	`177`	`dispatch_async(PBGetWorkQueue(),^{`
`178`		`- id ahead = [self countCommintsOf:[NSString stringWithFormat:@"origin/%@..%@",branch.revSpecifier,branch.revSpecifier]];`
`179`		`- id behind = [self countCommintsOf:[NSString stringWithFormat:@"%@..origin/%@",branch.revSpecifier,branch.revSpecifier]];`
	`178`	`+ id ahead = [self countCommitsOf:[NSString stringWithFormat:@"origin/%@..%@",branch.revSpecifier,branch.revSpecifier]];`
	`179`	`+ id behind = [self countCommitsOf:[NSString stringWithFormat:@"%@..origin/%@",branch.revSpecifier,branch.revSpecifier]];`
`180`	`180`	`dispatch_async(dispatch_get_main_queue(),^{`
`181`	`181`	`[branch setAhead:ahead];`
`182`	`182`	`[branch setBehind:behind];`
`183`	`183`	`[branch setIsCheckedOut:[branch.revSpecifier isEqual:[repository headRef]]];`
`184`	`184`	`});`
`185`	`185`	`});`
`186`	`186`	`}else if ([branch isKindOfClass:[PBGitSVFolderItem class]]) {`
`187`		`- [self updateMetaDataforBranches: branch];`
	`187`	`+ [self updateMetaDataForBranches: branch];`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
	`192`	`+-(void)updateMetaDataForBranches`
	`193`	`+{`
	`194`	`+ [self updateMetaDataForBranches: branches];`
	`195`	`+}`
`192`	`196`
`193`	`197`	`#pragma mark Badges Methods`
`194`	`198`
`@@ -205,7 +209,7 @@ -(void)evaluateRemoteBadge:(PBGitSVRemoteItem *)remote`
`205`	`209`	`}`
`206`	`210`	`}`
`207`	`211`
`208`		`--(NSNumber )countCommintsOf:(NSString )range`
	`212`	`+-(NSNumber )countCommitsOf:(NSString )range`
`209`	`213`	`{`
`210`	`214`	`NSArray *args = [NSArray arrayWithObjects:@"rev-list", range, nil];`
`211`	`215`	`int ret;`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ - (void) changeContentController:(PBViewController *)controller`
`135`	`135`
`136`	`136`	`[self setNextResponder: contentController];`
`137`	`137`	`[[self window] makeFirstResponder:[contentController firstResponder]];`
`138`		`- [contentController updateView];`
`139`	`138`	`[contentController addObserver:self forKeyPath:@"status" options:NSKeyValueObservingOptionInitial context:@"statusChange"];`
`140`	`139`	`}`
`141`	`140`