Merge branch 'refs/heads/master' into issues/182

Author: rowanj

Classes/Controllers/PBGitHistoryController.m

@@ -76,6 +76,12 @@ - (void)awakeFromNib
 	else
 		[repository lazyReload];
 
+    if (![repository hasSVNRemote])
+    {
+        // Remove the SVN revision table column for repositories with no SVN remote configured
+        [commitList removeTableColumn:[commitList tableColumnWithIdentifier:@"GitSVNRevision"]];
+    }
+
 	// Set a sort descriptor for the subject column in the history list, as
 	// It can't be sorted by default (because it's bound to a PBGitCommit)
 	[[commitList tableColumnWithIdentifier:@"SubjectColumn"] setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:@"subject" ascending:YES]];

Classes/Controllers/PBWebController.m

@@ -114,6 +114,12 @@ - (void)webView:(WebView *)sender
 	}
 }
 
+- (NSUInteger)webView:(WebView *)webView
+dragDestinationActionMaskForDraggingInfo:(id<NSDraggingInfo>)draggingInfo
+{
+    return NSDragOperationNone;
+}
+
 + (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
 {
 	return NO;

Classes/git/PBGitCommit.h

@@ -26,6 +26,7 @@ extern NSString * const kGitXCommitType;
 	NSString *_patch;
 	NSArray *parents;
 	NSString *realSHA;
+    NSString *SVNRevision;
 
 	int timestamp;
 	char sign;
@@ -52,6 +53,7 @@ extern NSString * const kGitXCommitType;
 @property (copy) NSString* subject;
 @property (copy) NSString* author;
 @property (copy) NSString *committer;
+@property (copy) NSString *SVNRevision;
 @property  NSArray *parents;
 
 @property (assign) int timestamp;

Classes/git/PBGitCommit.m

@@ -16,7 +16,7 @@
 
 @implementation PBGitCommit
 
-@synthesize repository, subject, timestamp, author, sign, lineInfo;
+@synthesize repository, subject, timestamp, author, sign, lineInfo, SVNRevision;
 @synthesize sha;
 @synthesize parents;
 @synthesize committer;
@@ -77,10 +77,13 @@ - (BOOL)isEqual:(id)otherCommit
 	if (self == otherCommit)
 		return YES;
 
+	if (!otherCommit)
+		return NO;
+
 	if (![otherCommit isMemberOfClass:[PBGitCommit class]])
 		return NO;
 
-	return [self.sha isEqual:[(PBGitCommit *)otherCommit sha]];
+	return [self->sha isEqual:((PBGitCommit *)otherCommit)->sha];
 }
 
 - (NSUInteger)hash

Classes/git/PBGitGrapher.mm

@@ -10,17 +10,20 @@
 #import "PBGitCommit.h"
 #import "PBGitLane.h"
 #import "PBGitGraphLine.h"
-#import <list>
+
+#import <vector>
 #import <git2/oid.h>
 #include <algorithm>
 
 using namespace std;
+typedef std::vector<PBGitLane *> LaneCollection;
+
 
 @implementation PBGitGrapher
 
 - (id) initWithRepository: (PBGitRepository*) repo
 {
-	pl = new std::list<PBGitLane *>;
+	pl = new LaneCollection;
 
 	PBGitLane::resetColors();
 	return self;
@@ -36,8 +39,8 @@ void add_line(struct PBGitGraphLine *lines, int *nLines, int upper, int from, in
 - (void) decorateCommit: (PBGitCommit *) commit
 {
 	int i = 0, newPos = -1;
-	std::list<PBGitLane *> *currentLanes = new std::list<PBGitLane *>;
-	std::list<PBGitLane *> *previousLanes = (std::list<PBGitLane *> *)pl;
+	LaneCollection *currentLanes = new LaneCollection;
+	LaneCollection *previousLanes = (LaneCollection *)pl;
 	NSArray *parents = [commit parents];
 	int nParents = [parents count];
 
@@ -52,7 +55,7 @@ - (void) decorateCommit: (PBGitCommit *) commit
 	// First, iterate over earlier columns and pass through any that don't want this commit
 	if (previous != nil) {
 		// We can't count until numColumns here, as it's only used for the width of the cell.
-		std::list<PBGitLane *>::iterator it = previousLanes->begin();
+		LaneCollection::iterator it = previousLanes->begin();
 		for (; it != previousLanes->end(); ++it) {
 			i++;
 			if (!*it) // This is an empty lane, created when the lane previously had a parentless(root) commit
@@ -108,7 +111,7 @@ - (void) decorateCommit: (PBGitCommit *) commit
 		git_oid parentOID = [(PBGitSHA*)[parents objectAtIndex:parentIndex] oid];
 		int i = 0;
 		BOOL was_displayed = NO;
-		std::list<PBGitLane *>::iterator it = currentLanes->begin();
+		LaneCollection::iterator it = currentLanes->begin();
 		for (; it != currentLanes->end(); ++it) {
 			i++;
 			if ((*it)->isCommit(parentOID)) {
@@ -171,8 +174,8 @@ - (void) decorateCommit: (PBGitCommit *) commit
 
 - (void) dealloc
 {
-	std::list<PBGitLane *> *lanes = (std::list<PBGitLane *> *)pl;
-	std::list<PBGitLane *>::iterator it = lanes->begin();
+	LaneCollection *lanes = (LaneCollection *)pl;
+	LaneCollection::iterator it = lanes->begin();
 	for (; it != lanes->end(); ++it)
 		delete *it;
 

Classes/git/PBGitRepository.h

@@ -106,6 +106,8 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 - (BOOL)isBareRepository;
 + (BOOL)isBareRepository:(NSURL*)repositoryURL;
 
+- (BOOL)hasSVNRemote;
++ (BOOL)hasSVNRemote:(NSURL*)repositoryURL;
 
 - (void) reloadRefs;
 - (void) lazyReload;

Classes/git/PBGitRepository.m

@@ -56,6 +56,32 @@ - (BOOL) isBareRepository
 	return [PBGitRepository isBareRepository:[self fileURL]];
 }
 
++ (BOOL) hasSVNRemote: (NSURL *)url
+{
+    // ObjectiveGit doesn't give us the machinery to determine whether there's an SVN remote
+    // defined; so let's just find out ourselves...
+    
+    NSError* pError;
+    GTRepository* gitRepo = [[GTRepository alloc] initWithURL:url error:&pError];
+    
+    if (gitRepo)
+    {
+        NSURL    *configURL = [NSURL URLWithString:@".git/config" relativeToURL:url];
+        NSString *gitConfig = [NSString stringWithContentsOfURL:configURL encoding:NSUTF8StringEncoding error:&pError];
+        
+        if ([gitConfig rangeOfString:@"svn-remote"].location != NSNotFound) {
+            return YES;
+        }
+    }
+
+    return NO;
+}
+
+- (BOOL) hasSVNRemote
+{
+    return [PBGitRepository hasSVNRemote:[self fileURL]];
+}
+
 // NSFileWrapper is broken and doesn't work when called on a directory containing a large number of directories and files.
 //because of this it is safer to implement readFromURL than readFromFileWrapper.
 //Because NSFileManager does not attempt to recursively open all directories and file when fileExistsAtPath is called

Classes/git/PBGitRevList.mm

@@ -105,7 +105,8 @@ - (void) walkRevisionListWithSpecifier:(PBGitRevSpecifier*)rev
 		std::map<string, NSStringEncoding> encodingMap;
 		NSThread *currentThread = [NSThread currentThread];
 
-		NSString *formatString = @"--pretty=format:%H\03%e\03%aN\03%cN\03%s\03%P\03%at";
+		NSString *formatString = @"--pretty=format:%H\03%e\03%aN\03%cN\03%s\03%b\03%P\03%at";
+
 		BOOL showSign = [rev hasLeftRight];
 
 		if (showSign)
@@ -132,6 +133,10 @@ - (void) walkRevisionListWithSpecifier:(PBGitRevSpecifier*)rev
 		__gnu_cxx::stdio_filebuf<char> buf(fd, std::ios::in);
 		std::istream stream(&buf);
 
+        // Regular expression for pulling out the SVN revision from the git log
+        NSError *error = nil;
+        NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"^git-svn-id: .*@(\\d+) .*$" options:NSRegularExpressionAnchorsMatchLines error:&error];
+        
 		int num = 0;
 		while (true) {
 			if ([currentThread isCancelled])
@@ -167,6 +172,9 @@ - (void) walkRevisionListWithSpecifier:(PBGitRevSpecifier*)rev
 
 			string subject;
 			getline(stream, subject, '\3');
+            
+            string message;
+            getline(stream, message, '\3');
 
 			string parentString;
 			getline(stream, parentString, '\3');
@@ -197,6 +205,31 @@ - (void) walkRevisionListWithSpecifier:(PBGitRevSpecifier*)rev
 			[newCommit setSubject:[NSString stringWithCString:subject.c_str() encoding:encoding]];
 			[newCommit setAuthor:[NSString stringWithCString:author.c_str() encoding:encoding]];
 			[newCommit setCommitter:[NSString stringWithCString:committer.c_str() encoding:encoding]];
+            
+            if ([repository hasSVNRemote])
+            {
+				// get the git-svn-id from the subject
+				NSString *string = [NSString stringWithCString:subject.c_str() encoding:encoding];
+				NSArray *matches = [regex matchesInString:string options:0 range:NSMakeRange(0, [string length])];
+				for (NSTextCheckingResult *match in matches)
+				{
+					NSRange matchRange = [match rangeAtIndex:1];
+                    NSString *matchString = [string substringWithRange:matchRange];
+                    [newCommit setSVNRevision:matchString];
+				}
+				
+                // get the git-svn-id from the message
+                string = [NSString stringWithCString:message.c_str() encoding:encoding];
+				matches = [regex matchesInString:string options:0 range:NSMakeRange(0, [string length])];
+                
+                for (NSTextCheckingResult *match in matches)
+                {
+                    NSRange matchRange = [match rangeAtIndex:1];
+                    NSString *matchString = [string substringWithRange:matchRange];
+                    [newCommit setSVNRevision:matchString];
+                }
+            }
+            
 			[newCommit setTimestamp:time];
 
 			if (showSign)

Classes/git/PBGitSHA.m

@@ -99,7 +99,10 @@ - (BOOL)isEqual:(id)otherSHA
 	if (self == otherSHA)
 		return YES;
 
-	git_oid other_oid = [(PBGitSHA *)otherSHA oid];
+	if  (!otherSHA)
+		return NO;
+
+	git_oid other_oid = ((PBGitSHA *)otherSHA)->oid;
 	return git_oid_cmp(&oid, &other_oid) == 0;
 }