Merge branch 'refs/heads/apla-master'

laullon · laullon · commit 571082a5d01e · 2011-03-30T11:43:51.000-07:00
Conflicts:
	GLFileView.m
diff --git a/Controller/PBSubmoduleController.m b/Controller/PBSubmoduleController.m
@@ -42,7 +42,8 @@ - (void) reload {
 		if ([submoduleLine length] == 0)
 			continue;
 		PBGitSubmodule *submodule = [[PBGitSubmodule alloc] initWithRawSubmoduleStatusString:submoduleLine];
-		[loadedSubmodules addObject:submodule];
+		if (submodule)
+			[loadedSubmodules addObject:submodule];
 	}
 	
 	NSMutableArray *groupedSubmodules = [[NSMutableArray alloc] init];
diff --git a/GLFileView.m b/GLFileView.m
@@ -303,13 +303,18 @@ + (NSString *)parseDiff:(NSString *)txt
 			[res appendString:[NSString stringWithFormat:@"<table id='%@' class='diff'><thead><tr><td colspan='3'><div style='float:left;'>",fileName]];
 			do{
 				[res appendString:[NSString stringWithFormat:@"<p>%@</p>",line]];
-				line=[lines objectAtIndex:++i];
+				line=nil;
+				if (i<([lines count]-1))
+					line = [lines objectAtIndex:++i];
 			}while([GLFileView isDiffHeader:line]);
 			[res appendString:@"</div>"];
 			if(![self isBinaryFile:line]){
 				[res appendString:[NSString stringWithFormat:@"<div class='filemerge'><a href='' onclick='openFileMerge(\"%@\",\"{SHA}\",\"{SHA2}\"); return false;'><img src='GitX://app:/filemerge' width='32' height='32'/><br/>open in<br/>FileMerge</a></div>",fileName]];
 			}
 			[res appendString:@"</td></tr></thead><tbody>"];
+
+			if (!line)
+				break; // do nothing, this is probably header-only diff (permissions change, maybe)
             
 			if([self isBinaryFile:line]){
 				NSArray *files=[self getFilesNames:line];
diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj
@@ -1855,7 +1855,6 @@
 				INFOPLIST_PREPROCESS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PREBINDING = NO;
-				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = macosx10.5;
 			};
 			name = Debug;
@@ -1872,7 +1871,6 @@
 				INFOPLIST_PREPROCESS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PREBINDING = NO;
-				RUN_CLANG_STATIC_ANALYZER = YES;
 				SDKROOT = macosx10.5;
 			};
 			name = Release;
diff --git a/Model/PBGitSubmodule.h b/Model/PBGitSubmodule.h
@@ -13,6 +13,7 @@ typedef enum {
 	PBGitSubmoduleStateNotInitialized,
 	PBGitSubmoduleStateMatchingIndex,
 	PBGitSubmoduleStateDoesNotMatchIndex,
+	PBGitSubmoduleStateFailed,
 } PBGitSubmoduleState;
 
 @interface PBGitSubmodule : NSObject<PBPresentable> {
diff --git a/Model/PBGitSubmodule.m b/Model/PBGitSubmodule.m
@@ -35,6 +35,10 @@ - (id) initWithRawSubmoduleStatusString:(NSString *) submoduleStatusString {
 	if ((self = [super init])) {
 		unichar status = [submoduleStatusString characterAtIndex:0];
 		submoduleState = [PBGitSubmodule submoduleStateFromCharacter:status];
+		if (submoduleState == PBGitSubmoduleStateFailed) {
+			NSLog(@"Submodule status failed:\n %@", submoduleStatusString);
+			return nil;
+		}
 		NSScanner *scanner = [NSScanner scannerWithString:[submoduleStatusString substringFromIndex:1]];
 		NSString *sha1 = nil;
 		NSString *fullPath = nil;
@@ -114,7 +118,7 @@ + (PBGitSubmoduleState) submoduleStateFromCharacter:(unichar) character {
 	} else if (character == '+') {
 		state = PBGitSubmoduleStateDoesNotMatchIndex;
 	} else if (character != ' ') {
-		NSAssert1(NO, @"Ooops unsupported submodule status character: %c", character);
+		return PBGitSubmoduleStateFailed;
 	}
 
 	return state;
diff --git a/PBGitCommitController.m b/PBGitCommitController.m
@@ -172,6 +172,7 @@ - (void)commitFinished:(NSNotification *)notification
 	[commitMessageView setEditable:YES];
 	[commitMessageView setString:@""];
 	[webController setStateMessage:[NSString stringWithFormat:[[notification userInfo] objectForKey:@"description"]]];
+	[repository reloadRefs];
 }	
 
 - (void)commitFailed:(NSNotification *)notification
diff --git a/PBGitHistoryController.h b/PBGitHistoryController.h
@@ -55,6 +55,7 @@
 	PBGitTree *gitTree;
 	PBGitCommit *webCommit;
 	PBGitCommit *selectedCommit;
+	PBGitCommit *selectedCommitBeforeRefresh;
 }
 
 @property (readonly) NSTreeController* treeController;
diff --git a/PBGitHistoryController.m b/PBGitHistoryController.m
@@ -250,7 +250,9 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(
 	}else if([(NSString *)context isEqualToString:@"updateCommitCount"] || [(NSString *)context isEqualToString:@"revisionListUpdating"]) {
 		[self updateStatus];
 
-		if ([repository.currentBranch isSimpleRef])
+		if (selectedCommitBeforeRefresh && [repository commitForSHA:[selectedCommitBeforeRefresh sha]])
+			[self selectCommit:[selectedCommitBeforeRefresh sha]];
+		else if ([repository.currentBranch isSimpleRef])
 			[self selectCommit:[repository shaForRef:[repository.currentBranch ref]]];
 		else
 			[self selectCommit:[[self firstCommit] sha]];
@@ -405,11 +407,13 @@ - (void) updateQuicklookForce:(BOOL)force
 
 - (IBAction) refresh:(id)sender
 {
+	selectedCommitBeforeRefresh = selectedCommit;
 	[repository forceUpdateRevisions];
 }
 
 - (void) updateView
 {
+    [self refresh: nil];
 	[self updateKeys];
 }
 
diff --git a/PBGitIndex.m b/PBGitIndex.m
@@ -235,6 +235,7 @@ - (void)commitWithMessage:(NSString *)commitMessage andVerify:(BOOL) doVerify
 		return;
 
 	repository.hasChanged = YES;
+    [repository reloadRefs];
 
 	amendEnvironment = nil;
 	if (amend)
diff --git a/PBGitRepository.m b/PBGitRepository.m
@@ -690,22 +690,34 @@ - (void) beginPushRef:(PBGitRef *)ref toRemote:(PBGitRef *)remoteRef
 	}
 	NSString *remoteName = [remoteRef remoteName];
 	[arguments addObject:remoteName];
-
+	
 	NSString *branchName = nil;
-	if ([ref isRemote] || !ref) {
-		branchName = @"all updates";
-	}
-	else if ([ref isTag]) {
-		branchName = [NSString stringWithFormat:@"tag '%@'", [ref tagName]];
-		[arguments addObject:@"tag"];
-		[arguments addObject:[ref tagName]];
-	}
-	else {
-		branchName = [ref shortName];
-		[arguments addObject:branchName];
+	NSString *actionType = nil;
+
+	if ([config valueForKeyPath:[NSString stringWithFormat:@"remote.%@.mirror", remoteName]]) {
+		// we must check for mirror parameter in config.
+		// if we push branch name in this case to the arguments, push failed
+		actionType = @"Mirroring";
+	} else {
+		
+		if ([ref isRemote] || !ref) {
+			branchName = @"all updates";
+		}
+		else if ([ref isTag]) {
+			branchName = [NSString stringWithFormat:@"tag '%@'", [ref tagName]];
+			[arguments addObject:@"tag"];
+			[arguments addObject:[ref tagName]];
+		}
+		else {
+			branchName = [ref shortName];
+			[arguments addObject:branchName];
+		}
+
+		actionType = [NSString stringWithFormat:@"Pushing %@", branchName];
+		
 	}
 
-	NSString *description = [NSString stringWithFormat:@"Pushing %@ to %@", branchName, remoteName];
+	NSString *description = [actionType stringByAppendingFormat:@" to %@", remoteName];
 	NSString *title = @"Pushing to remote";
 	[PBRemoteProgressSheet beginRemoteProgressSheetForArguments:arguments title:title description:description inRepository:self];
 }
@@ -1270,7 +1282,7 @@ - (NSString*) parseSymbolicReference:(NSString*) reference
 
 - (void) finalize
 {
-	NSLog(@"Dealloc of repository");
+	//NSLog(@"Dealloc of repository");
 	[super finalize];
 }
 @end
diff --git a/PBGitWindowController.m b/PBGitWindowController.m
@@ -33,7 +33,7 @@ - (id)initWithRepository:(PBGitRepository*)theRepository displayDefault:(BOOL)di
 
 - (void)windowWillClose:(NSNotification *)notification
 {
-	NSLog(@"Window will close!");
+	//NSLog(@"Window will close!");
 
 	if (sidebarController)
 		[sidebarController closeView];
@@ -175,7 +175,8 @@ - (IBAction) cloneTo:(id)sender
 
 - (IBAction) refresh:(id)sender
 {
-	[contentController refresh:self];
+    [sidebarController.historyViewController refresh: self];
+    [sidebarController.commitViewController refresh: self];
 }
 
 - (void) updateStatus
diff --git a/build_libgit2.sh b/build_libgit2.sh
@@ -14,6 +14,7 @@ buildAction () {
 	then
 		export PATH=$PATH:$HOME/bin:$HOME/local/bin:/sw/bin:/opt/local/bin:`"$TARGET_BUILD_DIR"/gitx --git-path`
 		git submodule init
+		git submodule sync
 		git submodule update
 		cd libgit2
 		rm -f libgit2.a

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ - (void) reload {`
`42`	`42`	`if ([submoduleLine length] == 0)`
`43`	`43`	`continue;`
`44`	`44`	`PBGitSubmodule *submodule = [[PBGitSubmodule alloc] initWithRawSubmoduleStatusString:submoduleLine];`
`45`		`- [loadedSubmodules addObject:submodule];`
	`45`	`+ if (submodule)`
	`46`	`+ [loadedSubmodules addObject:submodule];`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`NSMutableArray *groupedSubmodules = [[NSMutableArray alloc] init];`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@ - (void)commitFinished:(NSNotification *)notification`
`172`	`172`	`[commitMessageView setEditable:YES];`
`173`	`173`	`[commitMessageView setString:@""];`
`174`	`174`	`[webController setStateMessage:[NSString stringWithFormat:[[notification userInfo] objectForKey:@"description"]]];`
	`175`	`+ [repository reloadRefs];`
`175`	`176`	`}`
`176`	`177`
`177`	`178`	`- (void)commitFailed:(NSNotification *)notification`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@`
`55`	`55`	`PBGitTree *gitTree;`
`56`	`56`	`PBGitCommit *webCommit;`
`57`	`57`	`PBGitCommit *selectedCommit;`
	`58`	`+ PBGitCommit *selectedCommitBeforeRefresh;`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`@property (readonly) NSTreeController* treeController;`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,9 @@ - (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(`
`250`	`250`	`}else if([(NSString )context isEqualToString:@"updateCommitCount"] \|\| [(NSString )context isEqualToString:@"revisionListUpdating"]) {`
`251`	`251`	`[self updateStatus];`
`252`	`252`
`253`		`- if ([repository.currentBranch isSimpleRef])`
	`253`	`+ if (selectedCommitBeforeRefresh && [repository commitForSHA:[selectedCommitBeforeRefresh sha]])`
	`254`	`+ [self selectCommit:[selectedCommitBeforeRefresh sha]];`
	`255`	`+ else if ([repository.currentBranch isSimpleRef])`
`254`	`256`	`[self selectCommit:[repository shaForRef:[repository.currentBranch ref]]];`
`255`	`257`	`else`
`256`	`258`	`[self selectCommit:[[self firstCommit] sha]];`
`@@ -405,11 +407,13 @@ - (void) updateQuicklookForce:(BOOL)force`
`405`	`407`
`406`	`408`	`- (IBAction) refresh:(id)sender`
`407`	`409`	`{`
	`410`	`+ selectedCommitBeforeRefresh = selectedCommit;`
`408`	`411`	`[repository forceUpdateRevisions];`
`409`	`412`	`}`
`410`	`413`
`411`	`414`	`- (void) updateView`
`412`	`415`	`{`
	`416`	`+ [self refresh: nil];`
`413`	`417`	`[self updateKeys];`
`414`	`418`	`}`
`415`	`419`