Ticket #8439: generator_merging.patch

rails/railties/lib/rails_generator/commands.rb

@@ -93 +93 @@
-        private
-          # Ask the user interactively whether to force collision.
-          def force_file_collision?(destination, src, dst, file_options = {}, &block)
-
+m
-            case $stdin.gets
-              when /d/i
-                Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp|
-
+tmp_file = 
-                  temp.rewind
-                  $stdout.puts `#{diff_cmd} #{dst} #{temp.path}`
-                end
-
+$stdout.
-                raise 'retry diff'
+                                          when /m/i
+                Tempfile.open(File.basename(destination), File.dirname(dst)) do |temp|
+                  temp.write tmp_file = render_file(src, file_options, &block)
+                  temp.rewind
+                  options[:generated] = tmp_file
+                  options[:merge] = `#{merge_cmd} #{temp.path} #{dst} #{temp.path}` # means the label is the original file path
+                  $stdout.puts options[:merge]
+                end
+                $stdout.puts "merging #{spec.name}"
+                :merge
-              when /a/i
-                $stdout.puts "forcing #{spec.name}"
-                options[:collision] = :force
@@ -120 +130 @@
-            ENV['RAILS_DIFF'] || 'diff -u'
-          end
-
+          def merge_cmd
+            ENV['RAILS_MERGE'] || 'diff3 -m'
+          end
+
-          def render_template_part(template_options)
-            # Getting Sandbox to evaluate part template in it
-            part_binding = template_options[:sandbox].call.sandbox_binding
@@ -191 +205 @@
-        #   file 'settings/server.yml', 'config/server.yml', :collision => :skip
-        #
-        # Collisions are handled by checking whether the destination file
-
+merging, 
-        # the user what to do.
-        def file(relative_source, relative_destination, file_options = {}, &block)
-          # Determine full paths for source and destination files.
@@ -220 +234 @@
-            # skip the file; otherwise, log our transgression and continue.
-            case choice
-              when :force then logger.force(relative_destination)
+              when :merge then logger.merge(relative_destination)
-              when :skip  then return(logger.skip(relative_destination))
-              else raise "Invalid collision choice: #{choice}.inspect"
-            end
@@ -232 +247 @@
-          # If we're pretending, back off now.
-          return if options[:pretend]
-
+          FileUtils.cp(destination, destination + ".original") if options[:merge]
+          
-          # Write destination file with optional shebang.  Yield for content
-          # if block given so templaters may render the source file.  If a
-          # shebang is requested, replace the existing shebang or insert a
-          # new one.
-          File.open(destination, 'wb') do |dest|
-
+options[:merge] || 
-          end
+        
+          if options[:merge]
+            File.open(destination + ".generated", 'wb') do |dest|
+              dest.write options[:generated]
+            end
+          else
+            # Optionally change permissions.
+            if file_options[:chmod]
+              FileUtils.chmod(file_options[:chmod], destination)
+            end
-
-
-
-
+
+
-          end
-
-          # Optionally add file to subversion
-          system("svn add #{destination}") if options[:svn]
-        end
-
-        # Checks if the source and the destination file are identical. If