Skip to content

Commit

Permalink
Add preference to ignore whitespace differences in history view
Browse files Browse the repository at this point in the history 
We don't want to do this in the commit view, as that way you can't
commit whitespace differences. You'll never be able to have a clean
working tree, and you can't see why the files remain 'unstaged'. So, we do this
only for the history view :)
  • Loading branch information
@pieter
pieter committed Jun 11, 2009
1 parent e45c088 commit c00f736
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 21 deletions.
3 changes: 3 additions & 0 deletions ApplicationController.m
View file
Expand Up @@ -15,6 +15,7 @@
#import "PBGitXProtocol.h"
#import "PBPrefsWindowController.h"
#import "PBNSURLPathUserDefaultsTransfomer.h"
#import "PBGitDefaults.h"

@implementation ApplicationController
@synthesize cliProxy;
Expand All @@ -36,6 +37,8 @@ - (ApplicationController*)init
NSValueTransformer *transformer = [[PBNSURLPathUserDefaultsTransfomer alloc] init];
[NSValueTransformer setValueTransformer:transformer forName:@"PBNSURLPathUserDefaultsTransfomer"];

// Make sure the PBGitDefaults is initialized, by calling a random method
[PBGitDefaults class];
return self;
}

Expand Down
97 changes: 79 additions & 18 deletions English.lproj/Preferences.xib
View file
Expand Up @@ -46,7 +46,7 @@
<object class="NSTextField" id="441589300">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 102}, {99, 17}}</string>
<string key="NSFrame">{{17, 74}, {99, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="31526941">
Expand Down Expand Up @@ -90,7 +90,7 @@
<string>NSFilenamesPboardType</string>
</object>
</object>
<string key="NSFrame">{{121, 98}, {179, 22}}</string>
<string key="NSFrame">{{121, 70}, {179, 22}}</string>
<reference key="NSSuperview" ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPathCell" key="NSCell" id="331807888">
Expand All @@ -112,7 +112,7 @@
<object class="NSTextField" id="617839596">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{118, 48}, {192, 42}}</string>
<string key="NSFrame">{{118, 20}, {192, 42}}</string>
<reference key="NSSuperview" ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="453728129">
Expand All @@ -128,7 +128,7 @@
<object class="NSButton" id="1032928366">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{306, 102}, {54, 14}}</string>
<string key="NSFrame">{{306, 74}, {54, 14}}</string>
<reference key="NSSuperview" ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="806993456">
Expand All @@ -150,6 +150,33 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="910887184">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{18, 103}, {203, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="709654045">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Show whitespace differences</string>
<reference key="NSSupport" ref="734450335"/>
<reference key="NSControlView" ref="910887184"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
<object class="NSCustomResource" key="NSNormalImage" id="495198475">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
<object class="NSButtonImageSource" key="NSAlternateImage" id="690089052">
<string key="NSImageName">NSSwitch</string>
</object>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
</object>
<string key="NSFrameSize">{400, 139}</string>
<reference key="NSSuperview"/>
Expand Down Expand Up @@ -190,13 +217,8 @@
<reference key="NSControlView" ref="250497668"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
<object class="NSCustomResource" key="NSNormalImage" id="294005107">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
<object class="NSButtonImageSource" key="NSAlternateImage" id="690089052">
<string key="NSImageName">NSSwitch</string>
</object>
<reference key="NSNormalImage" ref="495198475"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
Expand Down Expand Up @@ -387,7 +409,7 @@
<reference key="NSControlView" ref="890810109"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
<reference key="NSNormalImage" ref="294005107"/>
<reference key="NSNormalImage" ref="495198475"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
Expand All @@ -404,6 +426,10 @@
<string key="NSClassName">SUUpdater</string>
</object>
<object class="NSUserDefaultsController" id="557723770">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>PBShowWhitespaceDifferences</string>
</object>
<bool key="NSSharedInstance">YES</bool>
</object>
<object class="NSCustomView" id="263788152">
Expand All @@ -425,7 +451,7 @@
<reference key="NSControlView" ref="237556568"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
<reference key="NSNormalImage" ref="294005107"/>
<reference key="NSNormalImage" ref="495198475"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
Expand All @@ -447,7 +473,7 @@
<reference key="NSControlView" ref="485413225"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
<reference key="NSNormalImage" ref="294005107"/>
<reference key="NSNormalImage" ref="495198475"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
Expand All @@ -469,7 +495,7 @@
<reference key="NSControlView" ref="933582906"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
<reference key="NSNormalImage" ref="294005107"/>
<reference key="NSNormalImage" ref="495198475"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
Expand All @@ -491,7 +517,7 @@
<reference key="NSControlView" ref="766070942"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">130</int>
<reference key="NSNormalImage" ref="294005107"/>
<reference key="NSNormalImage" ref="495198475"/>
<reference key="NSAlternateImage" ref="690089052"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
Expand Down Expand Up @@ -823,6 +849,22 @@
</object>
<int key="connectionID">113</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: values.PBShowWhitespaceDifferences</string>
<reference key="source" ref="910887184"/>
<reference key="destination" ref="557723770"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="910887184"/>
<reference key="NSDestination" ref="557723770"/>
<string key="NSLabel">value: values.PBShowWhitespaceDifferences</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">values.PBShowWhitespaceDifferences</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">117</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
Expand Down Expand Up @@ -859,9 +901,10 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="441589300"/>
<reference ref="617839596"/>
<reference ref="525163949"/>
<reference ref="617839596"/>
<reference ref="1032928366"/>
<reference ref="910887184"/>
</object>
<reference key="parent" ref="1002"/>
<string key="objectName">General</string>
Expand Down Expand Up @@ -1169,6 +1212,20 @@
<reference key="object" ref="817763751"/>
<reference key="parent" ref="766070942"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">114</int>
<reference key="object" ref="910887184"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="709654045"/>
</object>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">115</int>
<reference key="object" ref="709654045"/>
<reference key="parent" ref="910887184"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
Expand All @@ -1187,6 +1244,8 @@
<string>108.IBPluginDependency</string>
<string>109.IBPluginDependency</string>
<string>11.IBPluginDependency</string>
<string>114.IBPluginDependency</string>
<string>115.IBPluginDependency</string>
<string>12.IBPluginDependency</string>
<string>13.IBPluginDependency</string>
<string>14.IBPluginDependency</string>
Expand Down Expand Up @@ -1253,6 +1312,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{514, 459}, {106, 71}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
Expand Down Expand Up @@ -1320,7 +1381,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">113</int>
<int key="maxID">117</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Expand Down
10 changes: 7 additions & 3 deletions PBGitCommit.m
View file
Expand Up @@ -7,7 +7,7 @@
//

#import "PBGitCommit.h"

#import "PBGitDefaults.h"

@implementation PBGitCommit

Expand Down Expand Up @@ -73,8 +73,12 @@ - (NSString*) details
if (details != nil)
return details;

details = [self.repository outputForArguments:[NSArray arrayWithObjects:@"show", @"--pretty=raw", @"-M", @"--no-color", [self realSha], nil]];

NSMutableArray *arguments = [NSMutableArray arrayWithObjects:@"show", @"--pretty=raw", @"-M", @"--no-color", [self realSha], nil];
if (![PBGitDefaults showWhitespaceDifferences])
[arguments insertObject:@"-w" atIndex:1];

details = [self.repository outputForArguments:arguments];

return details;
}

Expand Down
1 change: 1 addition & 0 deletions PBGitDefaults.h
View file
Expand Up @@ -16,5 +16,6 @@
+ (BOOL) isGravatarEnabled;
+ (BOOL) confirmPublicGists;
+ (BOOL) isGistPublic;
+ (BOOL)showWhitespaceDifferences;

@end
9 changes: 9 additions & 0 deletions PBGitDefaults.m
View file
Expand Up @@ -14,6 +14,7 @@
#define kEnableGravatar @"PBEnableGravatar"
#define kConfirmPublicGists @"PBConfirmPublicGists"
#define kPublicGist @"PBGistPublic"
#define kShowWhitespaceDifferences @"PBShowWhitespaceDifferences"

@implementation PBGitDefaults

Expand All @@ -30,6 +31,8 @@ + (void)initialize
forKey:kConfirmPublicGists];
[defaultValues setObject:[NSNumber numberWithBool:NO]
forKey:kPublicGist];
[defaultValues setObject:[NSNumber numberWithBool:YES]
forKey:kShowWhitespaceDifferences];
[[NSUserDefaults standardUserDefaults] registerDefaults:defaultValues];
}

Expand Down Expand Up @@ -57,4 +60,10 @@ + (BOOL) isGistPublic
{
return [[NSUserDefaults standardUserDefaults] boolForKey:kPublicGist];
}


+ (BOOL)showWhitespaceDifferences
{
return [[NSUserDefaults standardUserDefaults] boolForKey:kShowWhitespaceDifferences];
}
@end

0 comments on commit c00f736

Please sign in to comment.