mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Johannes Gilger
7b6393570f
This enables a "discard" button for unstaged hunks which simply gets rid of the changes (by using "git apply --reverse"). To avoid repetition, the stageHunk method was split into a more generic processHunk method. The "discard" functionality is called through discardHunk. The NSAlert shown when discarding can be bypassed by pressing "Alt" while clicking the discard-button. Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
52 lines
1.3 KiB
Objective-C
52 lines
1.3 KiB
Objective-C
//
|
|
// PBGitCommitController.h
|
|
// GitX
|
|
//
|
|
// Created by Pieter de Bie on 19-09-08.
|
|
// Copyright 2008 __MyCompanyName__. All rights reserved.
|
|
//
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
#import "PBViewController.h"
|
|
|
|
@class PBGitIndexController;
|
|
@class PBIconAndTextCell;
|
|
@class PBWebChangesController;
|
|
|
|
@interface PBGitCommitController : PBViewController {
|
|
NSMutableArray *files;
|
|
|
|
IBOutlet NSTextView *commitMessageView;
|
|
IBOutlet NSArrayController *unstagedFilesController;
|
|
IBOutlet NSArrayController *cachedFilesController;
|
|
|
|
IBOutlet PBGitIndexController *indexController;
|
|
IBOutlet PBWebChangesController *webController;
|
|
|
|
NSString *status;
|
|
|
|
// We use busy as a count of active processes.
|
|
// You can increase it when your process start
|
|
// And decrease it after you have finished.
|
|
int busy;
|
|
BOOL amend;
|
|
|
|
}
|
|
|
|
@property (retain) NSMutableArray *files;
|
|
@property (copy) NSString *status;
|
|
@property (assign) int busy;
|
|
@property (assign) BOOL amend;
|
|
|
|
- (void) readCachedFiles:(NSNotification *)notification;
|
|
- (void) readOtherFiles:(NSNotification *)notification;
|
|
- (void) readUnstagedFiles:(NSNotification *)notification;
|
|
- (void) stageHunk: (NSString *)hunk reverse:(BOOL)reverse;
|
|
- (void)discardHunk:(NSString *)hunk;
|
|
|
|
- (NSString *)parentTree;
|
|
|
|
- (IBAction) refresh:(id) sender;
|
|
- (IBAction) commit:(id) sender;
|
|
@end
|