Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Delete some non functional left overs from a previous merge.

  • Loading branch information...
commit ad766c5c17a17ad597b74767b16f1b0671359c2d 1 parent f0a3502
André Berg authored
10 GitX.xcodeproj/project.pbxproj
View
@@ -37,6 +37,8 @@
6552BA27109C4CA8003B4892 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47DBDB690E94EF6500671A1E /* Preferences.xib */; };
65604690115BF80F0021E246 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 6560468F115BF80F0021E246 /* Debug.xcconfig */; };
656F3B0B115C042D00CA816E /* Common.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 656F3B0A115C042D00CA816E /* Common.xcconfig */; };
+ 659E57A2115C80D300786570 /* PBEasyPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */; };
+ 659E57D3115C819B00786570 /* PBGitBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = F53C4DF60E97FC630022AD59 /* PBGitBinary.m */; };
65C77FA0108BF560003BD3B5 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65C77F9F108BF560003BD3B5 /* Quartz.framework */; };
65F3544011599F3100235D5B /* AddRemoteBranchTemplate.png in Resources */ = {isa = PBXBuildFile; fileRef = 65A102F110A7D9FE0033C593 /* AddRemoteBranchTemplate.png */; };
65F3555B1159A95700235D5B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65F3555A1159A95700235D5B /* MainMenu.xib */; };
@@ -103,8 +105,6 @@
F52BCE030E84208300AA3741 /* PBGitHistoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F52BCE020E84208300AA3741 /* PBGitHistoryView.xib */; };
F52BCE070E84211300AA3741 /* PBGitHistoryController.m in Sources */ = {isa = PBXBuildFile; fileRef = F52BCE060E84211300AA3741 /* PBGitHistoryController.m */; };
F53C4DF70E97FC630022AD59 /* PBGitBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = F53C4DF60E97FC630022AD59 /* PBGitBinary.m */; };
- F53C4DF80E97FCA70022AD59 /* PBGitBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = F53C4DF60E97FC630022AD59 /* PBGitBinary.m */; };
- F53C4DF90E97FCAD0022AD59 /* PBEasyPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */; };
F53FF2050E7ABB5300389171 /* PBGitRevSpecifier.m in Sources */ = {isa = PBXBuildFile; fileRef = F53FF2040E7ABB5300389171 /* PBGitRevSpecifier.m */; };
F56174570E058893001DCD79 /* PBGitTree.m in Sources */ = {isa = PBXBuildFile; fileRef = F56174560E058893001DCD79 /* PBGitTree.m */; };
F56244090E9684B0002B6C44 /* PBUnsortableTableHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = F56244080E9684B0002B6C44 /* PBUnsortableTableHeader.m */; };
@@ -1236,8 +1236,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- F5EF8C8E0E9D4A5D0050906B /* PBWebController.m in Sources */,
8D11072D0486CEB800E47090 /* main.m in Sources */,
+ F5EF8C8E0E9D4A5D0050906B /* PBWebController.m in Sources */,
F574A2910EAE2FF4003F2CB1 /* PBGitConfig.m in Sources */,
77C8280E06725ACE000B614F /* ApplicationController.m in Sources */,
770B37ED0679A11B001EADE2 /* GitTest_DataModel.xcdatamodel in Sources */,
@@ -1317,8 +1317,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- F53C4DF90E97FCAD0022AD59 /* PBEasyPipe.m in Sources */,
- F53C4DF80E97FCA70022AD59 /* PBGitBinary.m in Sources */,
+ 659E57D3115C819B00786570 /* PBGitBinary.m in Sources */,
+ 659E57A2115C80D300786570 /* PBEasyPipe.m in Sources */,
913D5E4D0E55644E00CECEA2 /* gitx.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
2  PBGitWindowController.m
View
@@ -15,8 +15,6 @@
#import "PBGitSidebarController.h"
#import "NSString_Truncate.h"
-#define SHEET_INFOTEXT_CHAR_LIMIT 2000 // character size limit for the message sheet's info text
-
@implementation PBGitWindowController
67 PBRefController.h
View
@@ -13,80 +13,15 @@
#import "PBGitCommit.h"
#import "PBRefContextDelegate.h"
-@class KBPopUpToolbarItem;
@class PBRefMenuItem;
@interface PBRefController : NSObject <PBRefContextDelegate> {
IBOutlet __weak PBGitHistoryController *historyController;
IBOutlet NSArrayController *commitController;
IBOutlet PBCommitList *commitList;
-
-// <<<<<<< HEAD
-// IBOutlet NSWindow *newBranchSheet;
-// IBOutlet NSTextField *newBranchName;
-// IBOutlet NSTextField *errorMessage;
-//
-// IBOutlet NSWindow *addRemoteSheet;
-// IBOutlet NSTextField *addRemoteName;
-// IBOutlet NSTextField *addRemoteURL;
-// IBOutlet NSTextField *addRemoteErrorMessage;
-//
-// IBOutlet NSWindow *newTagSheet;
-// IBOutlet NSTextField *newTagName;
-// IBOutlet NSTextView *newTagMessage;
-// IBOutlet NSTextField *newTagErrorMessage;
-// IBOutlet NSTextField *newTagCommit;
-// IBOutlet NSTextField *newTagSHA;
-// IBOutlet NSTextField *newTagSHALabel;
-//
-// =======
-// >>>>>>> 096a176fbd169d7d93ebf71c3ec605bb6cabd366
IBOutlet NSPopUpButton *branchPopUp;
- IBOutlet KBPopUpToolbarItem *pullItem;
- IBOutlet KBPopUpToolbarItem *pushItem;
- IBOutlet KBPopUpToolbarItem *rebaseItem;
}
-// <<<<<<< HEAD
-// - (IBAction)addRef:(id)sender;
-// - (IBAction)closeSheet:(id) sender;
-// - (IBAction)saveSheet:(id) sender;
-//
-// - (IBAction)rebaseButton:(id)sender;
-// - (IBAction)pushButton:(id)sender;
-// - (IBAction)pullButton:(id)sender;
-// - (IBAction)fetchButton:(id)sender;
-//
-// - (IBAction)addRemoteButton:(id)sender;
-// - (IBAction)addRemoteSheet:(id)sender;
-// - (IBAction)closeAddRemoteSheet:(id)sender;
-//
-// - (IBAction)newTagButton:(id)sender;
-// - (IBAction)newTagSheet:(id)sender;
-// - (IBAction)closeNewTagSheet:(id)sender;
-//
-// - (NSArray *) menuItemsForRef:(PBGitRef *)ref commit:(PBGitCommit *)commit;
-//
-// - (void) changeBranch:(NSMenuItem *)sender;
-// - (void) selectCurrentBranch;
-// - (void) updateBranchMenus;
-// - (void) updateAllBranchesMenuWithLocal:(NSMutableArray *)localBranches remote:(NSMutableArray *)remoteBranches tag:(NSMutableArray *)tags other:(NSMutableArray *)other;
-// - (void) updatePopUpToolbarItemMenu:(KBPopUpToolbarItem *)item remotes:(NSMutableArray *)remoteBranches action:(SEL)action title:(NSString *)menuTitle;
-//
-// - (void) pullMenuAction:(NSMenuItem *)sender;
-// - (void) pushMenuAction:(NSMenuItem *)sender;
-// - (void) rebaseMenuAction:(NSMenuItem *)sender;
-//
-// - (BOOL) pullImpl:(NSString *)refName;
-// - (BOOL) pushImpl:(NSString *)refName;
-// - (BOOL) rebaseImpl:(NSString *)refName;
-// - (BOOL) fetchImpl:(NSString *)refName;
-// - (BOOL) addRemoteImplWithName:(NSString *)remoteName forURL:(NSString *)remoteURL;
-//
-// - (void) showMessageSheet:(NSString *)title message:(NSString *)msg;
-// - (void) toggleToolbarItems:(NSToolbar *)tb matchingLabels:(NSArray *)labels enabledState:(BOOL)state;
-// - (BOOL) validateToolbarItem:(NSToolbarItem *)theItem;
-// =======
- (void) fetchRemote:(PBRefMenuItem *)sender;
- (void) pullRemote:(PBRefMenuItem *)sender;
- (void) pushUpdatesToRemote:(PBRefMenuItem *)sender;
@@ -108,8 +43,6 @@
- (NSArray *) menuItemsForRef:(PBGitRef *)ref;
- (NSArray *) menuItemsForCommit:(PBGitCommit *)commit;
-// >>>>>>> 096a176fbd169d7d93ebf71c3ec605bb6cabd366
-
@end
@interface NSString (PBRefSpecAdditions)
Please sign in to comment.
Something went wrong with that request. Please try again.