diff --git a/PBChangedFile.h b/PBChangedFile.h
index 73ee3f0..2141e59 100644
--- a/PBChangedFile.h
+++ b/PBChangedFile.h
@@ -29,9 +29,11 @@ typedef enum {
@property (assign) BOOL hasCachedChanges;
@property (assign) BOOL hasUnstagedChanges;
- (NSImage *)icon;
-- (NSString *)changes;
+- (NSString *)cachedChangesAmend:(BOOL)amend;
+- (NSString *)unstagedChanges;
+
- (void) stageChanges;
-- (void) unstageChanges;
+- (void) unstageChangesAmend:(BOOL)amend;
- (id) initWithPath:(NSString *)p andRepository:(PBGitRepository *)r;
@end
diff --git a/PBChangedFile.m b/PBChangedFile.m
index 3bb0ae7..56434ed 100644
--- a/PBChangedFile.m
+++ b/PBChangedFile.m
@@ -20,8 +20,11 @@
return self;
}
-- (NSString *) cachedChanges
+- (NSString *) cachedChangesAmend:(BOOL) amend
{
+ if (amend)
+ return [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", @"--cached", @"HEAD^", @"--", path, nil]];
+
return [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"diff", @"--cached", @"--", path, nil]];
}
@@ -63,9 +66,12 @@
self.hasCachedChanges = YES;
}
-- (void) unstageChanges
+- (void) unstageChangesAmend:(BOOL) amend
{
- [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"reset", @"--", path, nil]];
+ if (amend)
+ [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"reset", @"HEAD^", @"--", path, nil]];
+ else
+ [repository outputInWorkdirForArguments:[NSArray arrayWithObjects:@"reset", @"--", path, nil]];
self.hasCachedChanges = NO;
self.hasUnstagedChanges = YES;
}
diff --git a/PBGitCommitController.h b/PBGitCommitController.h
index bfa04a7..7f00a3d 100644
--- a/PBGitCommitController.h
+++ b/PBGitCommitController.h
@@ -23,6 +23,7 @@
// You can increase it when your process start
// And decrease it after you have finished.
int busy;
+ BOOL amend;
IBOutlet PBIconAndTextCell* unstagedButtonCell;
IBOutlet PBIconAndTextCell* cachedButtonCell;
@@ -34,6 +35,7 @@
@property (retain) NSMutableArray *files;
@property (copy) NSString *status;
@property (assign) int busy;
+@property (assign) BOOL amend;
- (void) readCachedFiles:(NSNotification *)notification;
- (void) readOtherFiles:(NSNotification *)notification;
diff --git a/PBGitCommitController.m b/PBGitCommitController.m
index b6d5e2a..9248969 100644
--- a/PBGitCommitController.m
+++ b/PBGitCommitController.m
@@ -12,13 +12,15 @@
@implementation PBGitCommitController
-@synthesize files, status, busy;
+@synthesize files, status, busy, amend;
- (void)awakeFromNib
{
[super awakeFromNib];
self.busy = 0;
+ amend = NO;
+
[unstagedButtonCell setAction:@selector(rowClicked:)];
[cachedButtonCell setAction:@selector(rowClicked:)];
@@ -39,6 +41,18 @@
[[NSSortDescriptor alloc] initWithKey:@"path" ascending:true]]];
}
+- (void) setAmend:(BOOL)newAmend
+{
+ if (newAmend == amend)
+ return;
+ amend = newAmend;
+
+ if (amend && [[commitMessageView string] length] <= 3)
+ commitMessageView.string = [repository outputForCommand:@"log -1 --pretty=format:%s%n%n%b HEAD"];
+
+ [self refresh:self];
+}
+
- (NSArray *) linesFromNotification:(NSNotification *)notification
{
NSDictionary *userInfo = [notification userInfo];
@@ -60,16 +74,18 @@
- (NSString *) parentTree
{
- id a = [repository parseReference:@"HEAD"];
+ NSString *parent = amend ? @"HEAD^" : @"HEAD";
+
+ NSString *a = [repository parseReference:@"HEAD^"];
// TODO: parseReference should exit nil if it errors out. For
// now, compare to "HEAD"
- if ([a isEqualToString:@"HEAD"]) {
+ if ([a isEqualToString:parent]) {
// We don't have a head ref. Return the empty tree.
return @"4b825dc642cb6eb9a060e54bf8d69288fbee4904";
}
- return @"HEAD";
+ return parent;
}
- (void) refresh:(id) sender
@@ -233,9 +249,10 @@
int ret;
NSMutableArray *arguments = [NSMutableArray arrayWithObjects:@"commit-tree", tree, nil];
- if ([repository parseSymbolicReference:@"HEAD"]) {
+ NSString *parent = amend ? @"HEAD^" : @"HEAD";
+ if ([repository parseReference:parent]) {
[arguments addObject:@"-p"];
- [arguments addObject:@"HEAD"];
+ [arguments addObject:parent];
}
NSString *commit = [repository outputForArguments:arguments
@@ -259,7 +276,9 @@
repository.hasChanged = YES;
self.busy--;
[commitMessageView setString:@""];
+ amend = NO;
[self refresh:self];
+ self.amend = NO;
}
- (void) tableClicked:(NSTableView *) tableView
@@ -280,7 +299,7 @@
if ([tableView tag] == 0)
[selectedItem stageChanges];
else
- [selectedItem unstageChanges];
+ [selectedItem unstageChangesAmend:amend];
// Add the file to the other controller if it's not there yet
for (PBChangedFile *object in [otherController arrangedObjects])
diff --git a/PBGitCommitView.xib b/PBGitCommitView.xib
index 81e410c..ecbd2d9 100644
--- a/PBGitCommitView.xib
+++ b/PBGitCommitView.xib
@@ -48,7 +48,7 @@
1044
-
- {{0, 54}, {429, 141}}
+ {{0, 36}, {429, 159}}
530
@@ -472,214 +472,32 @@
-
+
-
-
-
-
+
+
- 241
+ 252
0
diff --git a/PBWebChangesController.m b/PBWebChangesController.m
index 12dd72f..e6cb917 100644
--- a/PBWebChangesController.m
+++ b/PBWebChangesController.m
@@ -27,6 +27,11 @@ static PBChangedFile *lastFileSelected = nil;
[self showDiff: lastFileSelected cached:NO];
}
+- (BOOL) amend
+{
+ return controller.amend;
+}
+
- (void)observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object
change:(NSDictionary *)change
diff --git a/html/diff.html b/html/diff.html
index 47ceb5a..56f0767 100644
--- a/html/diff.html
+++ b/html/diff.html
@@ -22,7 +22,7 @@
} else {
$("diff").hide();
if (cached)
- $("diff").innerHTML = file.cachedChanges().escapeHTML();
+ $("diff").innerHTML = file.cachedChangesAmend_(Controller.amend()).escapeHTML();
else
$("diff").innerHTML = file.unstagedChanges().escapeHTML();
highlightDiffs();