0
@@ -16,7 +16,7 @@ class CommitController < ApplicationController
0
     statuses = git.status(git.git_base)
0
     files = statuses.map { |status_options| (status_options[:status][:short] == "G") ? git.make_local_path(status_options[:path]) : nil }.compact
0
 
0
-    auto_add_rm(files)
0
+    git.auto_add_rm(files)
0
     res = git.commit(message, [])
0
     
0
     render "_commit_result", :locals => { :result => res, :files => files, :message => message }
0
@@ -61,7 +61,7 @@ class CommitController < ApplicationController
0
       msg, files = show_commit_dialog(files, statuses)
0
 
0
       unless files.empty?
0
-        auto_add_rm(files)
0
+        git.auto_add_rm(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
@@ -87,12 +87,4 @@ class CommitController < ApplicationController
0
       files = res[2..-1]
0
       return msg, files
0
     end
0
-    
0
-    def auto_add_rm(files)
0
-      git.chdir_base
0
-      add_files = files.select{ |f| File.exists?(f) }
0
-      remove_files = files.reject{ |f| File.exists?(f) }
0
-      res = git.add(add_files) unless add_files.empty?
0
-      res = git.rm(remove_files) unless remove_files.empty?
0
-    end
0
 end
0
\ No newline at end of file

0
@@ -230,6 +230,16 @@ module SCM
0
       command("rm", *files)
0
     end
0
     
0
+    def auto_add_rm(files)
0
+      chdir_base
0
+      add_files = files.select{ |f| File.exists?(f) }
0
+      remove_files = files.reject{ |f| File.exists?(f) }
0
+      res = ""
0
+      res << add(add_files) unless add_files.empty?
0
+      res << rm(remove_files) unless remove_files.empty?
0
+      res
0
+    end
0
+    
0
     def merge(merge_from_branch)
0
       parse_merge(command("merge", merge_from_branch))
0
     end