Adding code to support SVN fetch,rebase,dcommit buttons and sensing of svn-remote configuration in repository. No implementation of git svn commands yet, just code for the buttons.

Author: mattconnolly

PBGitConfig.h

@@ -16,4 +16,8 @@
 
 - init;
 - initWithRepositoryPath:(NSString *)path;
+
+// get config data: `git config -l`
+- (NSDictionary*) listConfigValuesInDir:(NSString*)inDir;
+
 @end

PBGitConfig.m

@@ -88,4 +88,37 @@ - (void) setValue:(id)value forKeyPath:(NSString *)path
 	// It doesn't exist at all. Write it locally.
 	[self writeValue:value forKey:path global:NO];
 }
+
+/**
+ runs `git config -l` returning a dict of key-value pairs from the result
+ 
+ passing nil as directory passes '--global' flag
+ */
+- (NSDictionary*) listConfigValuesInDir:(NSString*)inDir
+{
+    NSArray* arguments;
+    
+    if (inDir == nil) {
+        arguments = [NSArray arrayWithObjects:@"config", @"--global", @"-l", nil];
+    } else {
+        arguments = [NSArray arrayWithObjects:@"config", @"-l", nil];
+    }
+    
+	int ret = 1;
+	NSString* output = [PBEasyPipe outputForCommand:[PBGitBinary path] withArgs:arguments inDir:inDir retValue:&ret];
+    NSMutableDictionary *result = [NSMutableDictionary dictionary];
+    if (ret==0) {
+        NSArray *lines = [output componentsSeparatedByString:@"\n"];
+        
+        for (NSString* line in lines) {
+            NSRange equalsPos = [line rangeOfString:@"="];
+            NSString* key = [line substringToIndex:equalsPos.location];
+            NSString* value = [line substringFromIndex:equalsPos.location+1];
+            [result setObject:value forKey:key];
+        }
+    }
+    
+    return [NSDictionary dictionaryWithDictionary:result];
+}
+
 @end

PBGitRepository.h

@@ -69,6 +69,11 @@ static NSString * PBStringFromBranchFilterType(PBGitXBranchFilterType type) {
 - (BOOL) deleteRemote:(PBGitRef *)ref;
 - (BOOL) deleteRef:(PBGitRef *)ref;
 
+- (BOOL) hasSvnRemote;
+- (BOOL) svnFetch:(NSString*)remoteName;
+- (BOOL) svnRebase:(NSString*)remoteName;
+- (BOOL) svnDcommit:(NSString*)commitURL;
+
 - (NSFileHandle*) handleForCommand:(NSString*) cmd;
 - (NSFileHandle*) handleForArguments:(NSArray*) args;
 - (NSFileHandle *) handleInWorkDirForArguments:(NSArray *)args;

PBGitRepository.m

@@ -885,6 +885,50 @@ - (BOOL) deleteRef:(PBGitRef *)ref
 	return YES;
 }
 
+#pragma mark git svn commands
+
+/**
+ determines if the current repository has a git-svn configured remote
+ */
+- (BOOL) hasSvnRemote
+{
+    NSDictionary* configValues = [config listConfigValuesInDir:[self workingDirectory]];
+    
+    for (NSString* key in configValues) {
+        if ([key hasPrefix:@"svn-remote."]) return YES;
+    }
+    return NO;
+}
+
+/**
+ call `git svn fetch` with an optional remote name
+ 
+ remoteName can be NULL
+ */
+- (BOOL) svnFetch:(NSString*)remoteName
+{
+	return YES;
+}
+
+/**
+ call `git svn rebase` with an optional remote name
+ 
+ remoteName can be NULL
+ */
+- (BOOL) svnRebase:(NSString*)remoteName
+{
+	return YES;
+}
+
+/**
+ call `git svn dcommit` with optional commitURL
+ 
+ commitURL can be NULL
+ */
+- (BOOL) svnDcommit:(NSString*)commitURL
+{
+	return YES;
+}
 
 #pragma mark GitX Scripting
 

PBGitSidebarController.h

@@ -20,6 +20,10 @@
 	IBOutlet NSPopUpButton *actionButton;
 	IBOutlet NSSegmentedControl *remoteControls;
 
+    IBOutlet NSButton* svnFetchButton;
+    IBOutlet NSButton* svnRebaseButton;
+    IBOutlet NSButton* svnDcommitButton;
+    
 	NSMutableArray *items;
 
 	/* Specific things */
@@ -37,6 +41,9 @@
 - (NSMenu *) menuForRow:(NSInteger)row;
 
 - (IBAction) fetchPullPushAction:(id)sender;
+- (IBAction) svnFetch:(id)sender;
+- (IBAction) svnRebase:(id)sender;
+- (IBAction) svnDcommit:(id)sender;
 
 - (void)setHistorySearch:(NSString *)searchString mode:(NSInteger)mode;
 

PBGitSidebarController.m

@@ -371,6 +371,12 @@ - (void) updateRemoteControls
 	[remoteControls setEnabled:hasRemote forSegment:kFetchSegment];
 	[remoteControls setEnabled:hasRemote forSegment:kPullSegment];
 	[remoteControls setEnabled:hasRemote forSegment:kPushSegment];
+    
+    // get config
+    BOOL hasSVN = [repository hasSvnRemote];
+    [svnFetchButton setEnabled:hasSVN];
+    [svnRebaseButton setEnabled:hasSVN];
+    [svnDcommitButton setEnabled:hasSVN];
 }
 
 - (IBAction) fetchPullPushAction:(id)sender
@@ -408,5 +414,21 @@ - (IBAction) fetchPullPushAction:(id)sender
 	}
 }
 
+- (IBAction) svnFetch:(id)sender
+{
+    [repository svnFetch:nil];
+}
+
+- (IBAction) svnRebase:(id)sender
+{
+    printf("git svn rebase");
+    [repository svnRebase:nil];
+}
+
+- (IBAction) svnDcommit:(id)sender
+{
+    printf("git svn dcommit");
+    [repository svnDcommit:nil];
+}
 
 @end