0
@@ -1 +1,22 @@
0
+<?xml version="1.0" encoding="UTF-8"?>
0
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
0
+<plist version="1.0">
0
+<dict>
0
+	<key>beforeRunningCommand</key>
0
+	<string>nop</string>
0
+	<key>command</key>
0
+	<string>#!/usr/bin/env ruby
0
+
0
+require ENV['TM_BUNDLE_SUPPORT'] + '/environment.rb'
0
+dispatch(:controller =&gt; "commit", :type =&gt; "amend")</string>
0
+	<key>input</key>
0
+	<string>none</string>
0
+	<key>name</key>
0
+	<string>Amend Last Commit…</string>
0
+	<key>output</key>
0
+	<string>showAsHTML</string>
0
+	<key>uuid</key>
0
+	<string>2F24C9CB-23D0-4FDA-9C8D-210027DCEB27</string>
0
+</dict>
0
+</plist>

0
@@ -37,7 +37,14 @@
0
       end
0
       
0
       target_file_or_dir = git.paths.first
0
-      puts "<h1>Committing Files in ‘#{htmlize(shorten(target_file_or_dir, ENV['TM_PROJECT_DIRECTORY'] || @base))}’ on branch ‘#{htmlize(git.branch.current_name)}’</h1>"
0
+      
0
+      puts "<h1>"
0
+      if params[:type] == "amend"
0
+        puts "Amending the commit"
0
+      else
0
+        puts "Committing Files"
0
+      end
0
+      puts " in ‘#{htmlize(shorten(target_file_or_dir, ENV['TM_PROJECT_DIRECTORY'] || @base))}’ on branch ‘#{htmlize(git.branch.current_name)}’</h1>"
0
       flush
0
 
0
       files, statuses = [], []
0
@@ -55,7 +62,7 @@
0
 
0
       unless files.empty?
0
         auto_add_rm(files)
0
-        res = git.commit(msg, files)
0
+        res = git.commit(msg, files, :amend => (params[:type] == "amend"))
0
         render "_commit_result", :locals => { :files => files, :message => msg, :result => res}
0
       end
0
     end

0
@@ -4,8 +4,9 @@
0
     show_diff_title unless params[:layout].to_s=="false"
0
     @rev = params[:rev]
0
     @title = params[:title] || "Uncomitted changes"
0
-    params[:context_lines] = git.config["git-tmbundle.log.context-lines"] if git.config["git-tmbundle.log.context-lines"]
0
-    render("_diff_results", :locals => {:diff_results => git.diff(params)})
0
+    
0
+    diff_params = extract_diff_params(params)
0
+    render("_diff_results", :locals => {:diff_results => git.diff(diff_params)})
0
   end
0
   
0
   def uncommitted_changes
0
@@ -64,6 +65,13 @@
0
     end
0
     puts "</h2>"
0
   end
0
-
0
+  
0
+  def extract_diff_params(params)
0
+    diff_params = params.dup.delete_if do |key, value|
0
+      ! [:revisions, :revision, :branches, :tags, :path].include?(key)
0
+    end
0
+    diff_params[:context_lines] = git.config["git-tmbundle.log.context-lines"] if git.config["git-tmbundle.log.context-lines"]
0
+    diff_params
0
+  end
0
 end

0
@@ -215,8 +215,11 @@
0
       status.empty?
0
     end
0
 
0
-    def commit(msg, files = ["."])
0
-      parse_commit(command("commit", "-m", msg, *files))
0
+    def commit(msg, files = ["."], options = {})
0
+      args = ["commit"]
0
+      args << "--amend" if options[:amend]
0
+      args += ["-m", msg, *files]
0
+      parse_commit(command(*args))
0
     end
0
     
0
     def add(files = ["."])

0
@@ -257,5 +257,6 @@
0
   end
0
   
0
   include StreamProgressMethods
0
+  extend self
0
 end

0
@@ -3,6 +3,7 @@
0
 describe CommitController do
0
   include SpecHelpers
0
   before(:each) do
0
+    Git.reset_mock!
0
     @controller = CommitController.singleton_new
0
     @git = Git.singleton_new
0
     Git.command_response["status"] = fixture_file("status_output.txt")
0
@@ -16,9 +17,16 @@
0
       @message = "My commit message"
0
       @git.should_receive(:merge_message).and_return(nil)
0
       @controller.stub!(:show_commit_dialog).and_return([@message, ["file1.txt", "file2.txt"]])
0
-      Git.command_response["commit", "-m", "My commit message", "file1.txt", "file2.txt"] = fixture_file("commit_result.txt")
0
-      Git.command_response["diff", "24ff719^..24ff719", "."] = fixture_file("small.diff")
0
-      Git.command_response["branch"] = "* master"
0
+      
0
+      @git.should_receive(:commit).
0
+        with("My commit message", ["file1.txt", "file2.txt"], :amend => false).
0
+        and_return(:rev => "1234567")
0
+        
0
+      @git.should_receive(:diff).
0
+        with(:path => ".", :revisions => "1234567^..1234567").
0
+        and_return( Parsers.parse_diff(fixture_file("small.diff")) )
0
+      
0
+      @git.branch.stub!(:current_name).and_return("master")
0
       @output = capture_output do
0
         dispatch(:controller => "commit")
0
       end
0
@@ -26,6 +34,44 @@
0
     
0
     after(:each) do
0
       # puts Git.commands_ran.inspect
0
+    end
0
+    
0
+    it "should output the commit message" do
0
+      @output.should include(@message)
0
+    end
0
+    
0
+    it "should output the diff" do
0
+      @output.should include("No newline at end of file")
0
+    end
0
+  end
0
+  
0
+  describe "Ammend commit" do
0
+    before(:each) do
0
+      @message = "My commit message"
0
+      @git.should_receive(:merge_message).and_return(nil)
0
+      @controller.stub!(:show_commit_dialog).and_return([@message, ["file1.txt", "file2.txt"]])
0
+      
0
+      @git.should_receive(:commit).
0
+        with("My commit message", ["file1.txt", "file2.txt"], :amend => true).
0
+        and_return(:rev => "1234567")
0
+        
0
+      @git.should_receive(:diff).
0
+        with(:path => ".", :revisions => "1234567^..1234567").
0
+        and_return( Parsers.parse_diff(fixture_file("small.diff")) )
0
+        
0
+      @git.branch.stub!(:current_name).and_return("master")
0
+      
0
+      @output = capture_output do
0
+        dispatch(:controller => "commit", :type => "amend")
0
+      end
0
+    end
0
+    
0
+    after(:each) do
0
+      # puts Git.commands_ran.inspect
0
+    end
0
+    
0
+    it "should say mention we're amending a commit" do
0
+      @output.should include("Amending")
0
     end
0
     
0
     it "should output the commit message" do

0
@@ -93,6 +93,7 @@
0
     <string>B3577B4D-A3F1-4CB4-94B0-7A87CA658664</string>
0
     <string>46662F92-7739-42A7-B7CD-0527A0474BDC</string>
0
     <string>55CCBE51-3C13-46D8-92D9-52EAD7A5D2D6</string>
0
+		<string>2F24C9CB-23D0-4FDA-9C8D-210027DCEB27</string>
0
     <string>CDEA521C-8963-414F-8F8E-F9B81EF79ADA</string>
0
     <string>7F8D2058-E106-40DC-9FBE-F32A1202D158</string>
0
     <string>508C7FCD-E5DD-4E60-88C3-A668C48273B7</string>