kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge andreberg/master

Browse Source
This commit is contained in:
brotherbard
2009-11-08 18:19:41 -07:00
parent 6740c68027 37dcdf2c11
commit 0be790dad4
9 changed files with 121 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBGitCommitController.m
+1 -1
View File
@@ -108,7 +108,7 @@
- (IBAction) commit:(id) sender
{
if ([[NSFileManager defaultManager] fileExistsAtPath:[repository.fileURL.path stringByAppendingPathComponent:@"MERGE_HEAD"]]) {
if ([[NSFileManager defaultManager] fileExistsAtPath:[[[repository fileURL] path] stringByAppendingPathComponent:@"MERGE_HEAD"]]) {
[[repository windowController] showMessageSheet:@"Cannot commit merges" infoText:@"GitX cannot commit merges yet. Please commit your changes from the command line."];
return;
}
PBGitHistoryView.xib
+23 -21
View File
@@ -26,6 +26,7 @@
<integer value="427"/>
<integer value="459"/>
<integer value="354"/>
<integer value="237"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -170,7 +171,7 @@
<object class="NSTableView" id="254268962">
<reference key="NSNextResponder" ref="546023969"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{852, 228}</string>
<string key="NSFrameSize">{852, 308}</string>
<reference key="NSSuperview" ref="546023969"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="942510576">
@@ -354,7 +355,7 @@
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{0, 17}, {852, 228}}</string>
<string key="NSFrame">{{0, 17}, {852, 308}}</string>
<reference key="NSSuperview" ref="663765878"/>
<reference key="NSNextKeyView" ref="254268962"/>
<reference key="NSDocView" ref="254268962"/>
@@ -368,18 +369,18 @@
<reference key="NSSuperview" ref="663765878"/>
<reference key="NSTarget" ref="663765878"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">37</double>
<double key="NSPercent">0.19473679999999999</double>
<double key="NSPercent">0.95129870129870131</double>
</object>
<object class="NSScroller" id="452331733">
<reference key="NSNextResponder" ref="663765878"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{0, 196}, {837, 15}}</string>
<string key="NSFrame">{{0, 310}, {852, 15}}</string>
<reference key="NSSuperview" ref="663765878"/>
<bool key="NSEnabled">YES</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="663765878"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.21932109999999999</double>
<double key="NSPercent">0.9988276670574443</double>
</object>
<object class="NSClipView" id="906093892">
<reference key="NSNextResponder" ref="663765878"/>
@@ -397,10 +398,10 @@
</object>
<reference ref="806470424"/>
</object>
<string key="NSFrameSize">{852, 245}</string>
<string key="NSFrameSize">{852, 325}</string>
<reference key="NSSuperview" ref="202620420"/>
<reference key="NSNextKeyView" ref="546023969"/>
<int key="NSsFlags">560</int>
<int key="NSsFlags">688</int>
<reference key="NSVScroller" ref="152625445"/>
<reference key="NSHScroller" ref="452331733"/>
<reference key="NSContentView" ref="546023969"/>
@@ -411,7 +412,7 @@
<object class="NSTabView" id="135073984">
<reference key="NSNextResponder" ref="202620420"/>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 246}, {852, 152}}</string>
<string key="NSFrame">{{0, 326}, {852, 72}}</string>
<reference key="NSSuperview" ref="202620420"/>
<object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -509,7 +510,7 @@
<object class="NSOutlineView" id="216928480">
<reference key="NSNextResponder" ref="859661469"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{124, 152}</string>
<string key="NSFrameSize">{124, 72}</string>
<reference key="NSSuperview" ref="859661469"/>
<bool key="NSEnabled">YES</bool>
<object class="_NSCornerView" key="NSCornerView">
@@ -563,7 +564,7 @@
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
<string key="NSFrame">{{1, 1}, {124, 152}}</string>
<string key="NSFrame">{{1, 1}, {124, 72}}</string>
<reference key="NSSuperview" ref="776605770"/>
<reference key="NSNextKeyView" ref="216928480"/>
<reference key="NSDocView" ref="216928480"/>
@@ -573,11 +574,11 @@
<object class="NSScroller" id="692013536">
<reference key="NSNextResponder" ref="776605770"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{125, 1}, {15, 152}}</string>
<string key="NSFrame">{{125, 1}, {15, 72}}</string>
<reference key="NSSuperview" ref="776605770"/>
<reference key="NSTarget" ref="776605770"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.94736842105263153</double>
<double key="NSPercent">0.73684210526315785</double>
</object>
<object class="NSScroller" id="471196443">
<reference key="NSNextResponder" ref="776605770"/>
@@ -591,7 +592,7 @@
<double key="NSPercent">0.99801189999999995</double>
</object>
</object>
<string key="NSFrameSize">{141, 154}</string>
<string key="NSFrameSize">{141, 74}</string>
<reference key="NSSuperview" ref="626906425"/>
<reference key="NSNextKeyView" ref="859661469"/>
<int key="NSsFlags">18</int>
@@ -805,7 +806,7 @@
<nil key="NSDelegate"/>
</object>
</object>
<string key="NSFrame">{{1, 1}, {693, 152}}</string>
<string key="NSFrame">{{1, 1}, {693, 72}}</string>
<reference key="NSSuperview" ref="630571485"/>
<reference key="NSNextKeyView" ref="75600241"/>
<reference key="NSDocView" ref="75600241"/>
@@ -819,11 +820,12 @@
<object class="NSScroller" id="802032705">
<reference key="NSNextResponder" ref="630571485"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{694, 1}, {15, 152}}</string>
<string key="NSFrame">{{694, 1}, {15, 72}}</string>
<reference key="NSSuperview" ref="630571485"/>
<bool key="NSEnabled">YES</bool>
<reference key="NSTarget" ref="630571485"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.96938775510204078</double>
<double key="NSPercent">0.73469387755102045</double>
</object>
<object class="NSScroller" id="667376581">
<reference key="NSNextResponder" ref="630571485"/>
@@ -837,22 +839,22 @@
<double key="NSPercent">0.94565220000000005</double>
</object>
</object>
<string key="NSFrame">{{142, 0}, {710, 154}}</string>
<string key="NSFrame">{{142, 0}, {710, 74}}</string>
<reference key="NSSuperview" ref="626906425"/>
<reference key="NSNextKeyView" ref="321980917"/>
<int key="NSsFlags">18</int>
<int key="NSsFlags">82</int>
<reference key="NSVScroller" ref="802032705"/>
<reference key="NSHScroller" ref="667376581"/>
<reference key="NSContentView" ref="321980917"/>
</object>
</object>
<string key="NSFrameSize">{852, 154}</string>
<string key="NSFrameSize">{852, 74}</string>
<reference key="NSSuperview" ref="657042048"/>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
</object>
</object>
<string key="NSFrameSize">{852, 152}</string>
<string key="NSFrameSize">{852, 72}</string>
<reference key="NSSuperview" ref="135073984"/>
</object>
<string key="NSLabel">Tree</string>
PBGitIndex.m
+1 -1
View File
@@ -155,7 +155,7 @@ NSString *PBGitIndexOperationFailed = @"PBGitIndexOperationFailed";
[commitSubject appendString:[commitMessage substringToIndex:newLine.location]];
NSString *commitMessageFile;
commitMessageFile = [repository.fileURL.path stringByAppendingPathComponent:@"COMMIT_EDITMSG"];
commitMessageFile = [[[repository fileURL] path] stringByAppendingPathComponent:@"COMMIT_EDITMSG"];
[commitMessage writeToFile:commitMessageFile atomically:YES encoding:NSUTF8StringEncoding error:nil];
PBGitRevList.mm
+2 -2
View File
@@ -87,10 +87,10 @@ using namespace std;
else
[arguments addObjectsFromArray:[rev parameters]];
NSString *directory = rev.workingDirectory ? rev.workingDirectory.path : repository.fileURL.path;
NSString *directory = rev.workingDirectory ? [rev.workingDirectory path] : [[repository fileURL] path];
NSTask *task = [PBEasyPipe taskForCommand:[PBGitBinary path] withArgs:arguments inDir:directory];
[task launch];
NSFileHandle* handle = [task.standardOutput fileHandleForReading];
NSFileHandle* handle = [[task standardOutput] fileHandleForReading];
int fd = [handle fileDescriptor];
__gnu_cxx::stdio_filebuf<char> buf(fd, std::ios::in);
PBPrefsWindowController.m
+5 -4
View File
@@ -44,7 +44,7 @@
[openPanel setAllowsMultipleSelection:NO];
[openPanel setTreatsFilePackagesAsDirectories:YES];
[openPanel setAccessoryView:gitPathOpenAccessory];
//[[openPanel _navView] setShowsHiddenFiles:YES];
//[openPanel setShowsHiddenFiles:YES];
gitPathOpenPanel = openPanel;
}
@@ -54,9 +54,10 @@
- (IBAction) showHideAllFiles: sender
{
/* FIXME: This uses undocumented OpenPanel features to show hidden files! */
NSNumber *showHidden = [NSNumber numberWithBool:[sender state] == NSOnState];
[[gitPathOpenPanel valueForKey:@"_navView"] setValue:showHidden forKey:@"showsHiddenFiles"];
//NSNumber *showHidden = [NSNumber numberWithBool:[sender state] == NSOnState];
//[[gitPathOpenPanel valueForKey:@"_navView"] setValue:showHidden forKey:@"showsHiddenFiles"];
BOOL showHidden = ([sender state] == NSOnState);
[gitPathOpenPanel setShowsHiddenFiles:showHidden];
}
@end
PBRefController.h
+1
View File
@@ -68,6 +68,7 @@
- (BOOL) addRemoteImplWithName:(NSString *)remoteName forURL:(NSString *)remoteURL;
- (void) showMessageSheet:(NSString *)title message:(NSString *)msg;
- (void) toggleToolbarItems:(NSToolbar *)tb matchingLabels:(NSArray *)labels enabledState:(BOOL)state;
@end
PBRefController.m
+60 -19
View File
@@ -47,6 +47,7 @@
[historyController.repository removeBranch:[[PBGitRevSpecifier alloc] initWithRef:[refMenuItem ref]]];
[[refMenuItem commit] removeRef:[refMenuItem ref]];
[commitController rearrangeObjects];
[self updateBranchMenu];
}
}
@@ -134,7 +135,8 @@
[self showMessageSheet:@"Pull from Remote" message:PBMissingRemoteErrorMessage];
return success;
}
NSString *rval = [historyController.repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"pull", remote, refName, nil] retValue: &ret];
NSArray * args = [NSArray arrayWithObjects:@"pull", remote, refName, nil];
NSString *rval = [historyController.repository outputInWorkdirForArguments:args retValue: &ret];
if (ret) {
NSString *info = [NSString stringWithFormat:@"There was an error pulling from the remote repository.\n\n%d\n%@", ret, rval];
[[historyController.repository windowController] showMessageSheet:@"Pulling from remote failed" infoText:info];
@@ -152,7 +154,7 @@
BOOL success = NO;
NSString *remote = [[[historyController repository] config] valueForKeyPath:[NSString stringWithFormat:@"branch.%@.remote", refName]];
if (!remote) {
[self showMessageSheet:@"Pull Rebase from Remote" message:PBMissingRemoteErrorMessage];
[self showMessageSheet:@"Pull from Remote and Rebase" message:PBMissingRemoteErrorMessage];
return success;
}
NSString *rval = [[historyController repository] outputInWorkdirForArguments:[NSArray arrayWithObjects:@"pull", @"--rebase", remote, refName, nil] retValue: &ret];
@@ -204,6 +206,25 @@
return success;
}
- (void) toggleToolbarItems:(NSToolbar *)tb matchingLabels:(NSArray *)labels enabledState:(BOOL)state {
NSArray * tbItems = [tb items];
/* if labels is nil, assume all toolbar items */
if (!labels) {
for (NSToolbarItem * curItem in tbItems) {
[curItem setEnabled:state];
}
} else {
for (NSToolbarItem * curItem in tbItems) {
for (NSString * curLabel in labels) {
if ([[curItem label] isEqualToString:curLabel]) {
[curItem setEnabled:state];
}
}
}
}
}
# pragma mark Tableview delegate methods
- (BOOL)tableView:(NSTableView *)tv writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard*)pboard
@@ -286,6 +307,8 @@
}
# pragma mark Add ref methods
-(void)addRef:(id)sender
{
[errorMessage setStringValue:@""];
@@ -296,21 +319,7 @@
contextInfo:NULL];
}
- (void) showMessageSheet:(NSString *)title message:(NSString *)msg {
[[NSAlert alertWithMessageText:title
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
informativeTextWithFormat:msg]
beginSheetModalForWindow:[[historyController view] window]
modalDelegate:self
didEndSelector:nil
contextInfo:nil];
return;
}
// MARK: Buttons
-(void)rebaseButton:(id)sender
{
NSString *refName = [[[[historyController repository] currentBranch] simpleRef] refForSpec];
@@ -357,6 +366,23 @@
// NSLog([NSString stringWithFormat:@"Fetch hit for %@!", refName]);
}
// MARK: Sheets
- (void) showMessageSheet:(NSString *)title message:(NSString *)msg {
[[NSAlert alertWithMessageText:title
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
informativeTextWithFormat:msg]
beginSheetModalForWindow:[[historyController view] window]
modalDelegate:self
didEndSelector:nil
contextInfo:nil];
return;
}
-(void)saveSheet:(id) sender
{
NSString *branchName = [@"refs/heads/" stringByAppendingString:[newBranchName stringValue]];
@@ -632,8 +658,23 @@
- (void) selectCurrentBranch
{
PBGitRevSpecifier *rev = historyController.repository.currentBranch;
if (rev)
[branchPopUp setTitle:[rev description]];
NSToolbar * tb = historyController.viewToolbar;
NSArray * tbLabels = [NSArray arrayWithObjects:@"Push", @"Pull", @"Rebase", nil];
if (rev) {
[branchPopUp setTitle:[rev description]];
if ([[rev description] isEqualToString:@"All branches"] ||
[[rev description] isEqualToString:@"Local branches"])
{
[self toggleToolbarItems:tb matchingLabels:tbLabels enabledState:NO];
} else {
[self toggleToolbarItems:tb matchingLabels:tbLabels enabledState:YES];
}
} else {
/* just in case, re-enable all toolbar buttons */
[self toggleToolbarItems:tb matchingLabels:nil enabledState:YES];
}
}
@end
PBWebHistoryController.m
+1 -1
View File
@@ -112,7 +112,7 @@ contextMenuItemsForElement:(NSDictionary *)element
// Every ref has a class name of 'refs' and some other class. We check on that to see if we pressed on a ref.
if ([[node className] hasPrefix:@"refs "]) {
NSString *selectedRefString = [[[node childNodes] item:0] textContent];
for (PBGitRef *ref in historyController.webCommit.refs)
for (PBGitRef *ref in [historyController.webCommit refs])
{
if ([[ref shortName] isEqualToString:selectedRefString])
return [contextMenuDelegate menuItemsForRef:ref commit:historyController.webCommit];
RepositoryWindow.xib
+27 -11
View File
@@ -81,9 +81,11 @@
<string key="NSToolbarItemPaletteLabel">View selector</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSegmentedControl" key="NSToolbarItemView" id="680923877">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {87, 25}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<int key="NSTag">3</int>
<bool key="NSEnabled">YES</bool>
<object class="NSSegmentedCell" key="NSCell" id="485405534">
@@ -141,9 +143,11 @@
<string key="NSToolbarItemPaletteLabel">Clone</string>
<string key="NSToolbarItemToolTip">Clone a repository</string>
<object class="NSButton" key="NSToolbarItemView" id="142028164">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{1, 14}, {36, 25}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="737146655">
<int key="NSCellFlags">-2080244224</int>
@@ -184,9 +188,11 @@
</object>
<nil key="NSToolbarItemToolTip"/>
<object class="NSSearchField" key="NSToolbarItemView" id="956449339">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{0, 14}, {183, 22}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="63687217">
<int key="NSCellFlags">343014976</int>
@@ -279,9 +285,11 @@
<string key="NSToolbarItemPaletteLabel">Create Branch</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSButton" key="NSToolbarItemView" id="452659168">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{21, 14}, {40, 25}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="913477460">
<int key="NSCellFlags">-2080244224</int>
@@ -320,9 +328,11 @@
<string key="NSToolbarItemPaletteLabel">Branch</string>
<nil key="NSToolbarItemToolTip"/>
<object class="NSPopUpButton" key="NSToolbarItemView" id="940778637">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {134, 26}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="973289212">
<int key="NSCellFlags">-2076049856</int>
@@ -411,9 +421,11 @@ ZW1vdGUgY29uZmlndXJlZCBmb3IgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBicmFuY2ggZnJvbSB0aGUg
YnJhbmNoIHBvcHVwIG1lbnUuIAoKTm90ZTogdGhlIGJyYW5jaCBoYXMgdG8gYmUgc3BlY2lmaWMuIAon
QWxsIGJyYW5jaGVzJyBvciAnTG9jYWwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
<object class="NSButton" key="NSToolbarItemView" id="281743283">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {35, 25}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="886733819">
<int key="NSCellFlags">-2080244224</int>
@@ -456,9 +468,11 @@ bGVjdGVkIGJyYW5jaCBmcm9tIHRoZSBicmFuY2ggcG9wdXAgbWVudQoKTm90ZTogdGhlIGJyYW5jaCBo
YXMgdG8gYmUgc3BlY2lmaWMuIAonQWxsIGJyYW5jaGVzJyBvciAnTG9jYWwgYnJhbmNoZXMnIHdpbGwg
bm90IHdvcms</string>
<object class="NSButton" key="NSToolbarItemView" id="737301086">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{0, 14}, {35, 25}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="606560874">
<int key="NSCellFlags">-2080244224</int>
@@ -505,9 +519,11 @@ ZXMgdGhhdCBpbmZvcm1hdGlvbiB0byBhdm9pZCByZWJhc2luZyBub24tbG9jYWwgY2hhbmdlcwoKTm90
ZTogdGhlIGxvY2FsIGJyYW5jaCBoYXMgdG8gYmUgc3BlY2lmaWMuIAonQWxsIGJyYW5jaGVzJyBvciAn
TG9jYWwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
<object class="NSButton" key="NSToolbarItemView" id="143566961">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{5, 14}, {35, 25}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="739572861">
<int key="NSCellFlags">-2080244224</int>
@@ -1006,9 +1022,9 @@ TG9jYWwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{180, 303}, {850, 550}}</string>
<string>{{519, 294}, {850, 550}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{180, 303}, {850, 550}}</string>
<string>{{519, 294}, {850, 550}}</string>
<integer value="1"/>
<integer value="1"/>
<string>{{15, 196}, {850, 418}}</string>
@@ -1016,7 +1032,7 @@ TG9jYWwgYnJhbmNoZXMnIHdpbGwgbm90IHdvcmsuA</string>
<integer value="1"/>
<string>{3.40282e+38, 3.40282e+38}</string>
<string>{213, 107}</string>
<string>{{297, 853}, {616, 0}}</string>
<string>{{636, 844}, {616, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{132, 614}, {616, 0}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>