0
@@ -39,10 +39,6 @@ module Piston
0
         wc.validate!
0
         wc
0
       end
0
-
0
-      def temp_dir_name(working_copy)
0
-        working_copy.path.parent + ".#{working_copy.path.basename}.tmp"
0
-      end
0
     end
0
   end
0
 end

0
@@ -30,35 +30,12 @@ module Piston
0
         logger.debug {"repository_url: #{repository_url.inspect}, target_revision: #{target_revision.inspect}, wcdir: #{wcdir.inspect}"}
0
         working_copy = guess_wc(wcdir)
0
 
0
-        tmpdir = temp_dir_name(working_copy)
0
-
0
         if working_copy.exist? && !force then
0
           logger.fatal "Path #{working_copy} already exists and --force not given.  Aborting..."
0
           abort
0
         end
0
-
0
-        begin
0
-          logger.info {"Checking out the repository"}
0
-          revision.checkout_to(tmpdir)
0
-
0
-          logger.debug {"Creating the local working copy"}
0
-          working_copy.create
0
-
0
-          logger.info {"Copying from #{revision}"}
0
-          working_copy.copy_from(revision)
0
-
0
-          logger.debug {"Remembering values"}
0
-          working_copy.remember({:repository_url => repository.url, :lock => options[:lock], :repository_class => repository.class.name},
0
-          revision.remember_values)
0
-
0
-          logger.debug {"Finalizing working copy"}
0
-          working_copy.finalize
0
-
0
-          logger.info {"Checked out #{repository_url.inspect} #{revision.name} to #{wcdir.inspect}"}
0
-        ensure
0
-          logger.debug {"Removing temporary directory: #{tmpdir}"}
0
-          tmpdir.rmtree rescue nil
0
-        end
0
+        
0
+        working_copy.import(revision, options[:lock])
0
       end
0
     end
0
   end

0
@@ -22,15 +22,7 @@ module Piston
0
 
0
         logger.info {"Updating from #{from_revision} to #{to_revision}"}
0
 
0
-        tmpdir = temp_dir_name(working_copy)
0
-        to_revision.checkout_to(tmpdir)
0
-
0
-        begin
0
-          working_copy.update(from_revision, to_revision, tmpdir, options[:lock])
0
-        ensure
0
-          logger.debug {"Removing temporary directory: #{tmpdir}"}
0
-          tmpdir.rmtree rescue nil
0
-        end
0
+        working_copy.update(to_revision, options[:lock])
0
       end
0
     end
0
   end

0
@@ -58,23 +58,33 @@ module Piston
0
         Dir.chdir(path) { git(:add, ".") }
0
       end
0
 
0
-      def update(from, to, tmpdir, lock)
0
-        puts "tmpdir: #{tmpdir}"
0
-        puts "exist? #{tmpdir.exist?}"
0
-        puts "file? #{tmpdir.file?}"
0
-        puts "directory? #{tmpdir.directory?}"
0
-        path.children.reject {|item| ['.git', '.piston.yml'].include?(item.basename.to_s)}.each do |item|
0
-          puts "rm -rf #{item}"
0
-          FileUtils.rm_rf(item)
0
-        end
0
-        tmpdir.children.reject {|item| item.basename.to_s == '.git'}.each do |item|
0
-          puts "cp -r #{item} #{path}"
0
-          FileUtils.cp_r(item, path)
0
-        end
0
-        FileUtils.rm_rf(tmpdir)
0
-        Dir.chdir(path) do
0
-          remember(recall.merge(:lock => lock), to.remember_values)
0
-          git(:add, ".")
0
+      def update(to, lock)
0
+        tmpdir = temp_dir_name
0
+        begin
0
+          to.checkout_to(tmpdir)
0
+          puts "tmpdir: #{tmpdir}"
0
+          puts "exist? #{tmpdir.exist?}"
0
+          puts "file? #{tmpdir.file?}"
0
+          puts "directory? #{tmpdir.directory?}"
0
+          path.children.reject {|item| ['.git', '.piston.yml'].include?(item.basename.to_s)}.each do |item|
0
+            puts "rm -rf #{item}"
0
+            FileUtils.rm_rf(item)
0
+          end
0
+          tmpdir.children.reject {|item| item.basename.to_s == '.git'}.each do |item|
0
+            puts "cp -r #{item} #{path}"
0
+            FileUtils.cp_r(item, path)
0
+          end
0
+          Dir.chdir(path) do
0
+            repository = to.repository
0
+            remember(
0
+              {:repository_url => repository.url, :lock => lock, :repository_class => repository.class.name},
0
+              to.remember_values
0
+            )
0
+            git(:add, ".")
0
+          end
0
+        ensure
0
+          logger.debug {"Removing temporary directory: #{tmpdir}"}
0
+          tmpdir.rmtree rescue nil
0
         end
0
       end
0
     end

0
@@ -78,15 +78,22 @@ module Piston
0
         end
0
       end
0
 
0
-      def update(from, to, tmpdir, lock)
0
-        logger.info "Copying new changes in place"
0
-        copy_from(to)
0
-        logger.info "Merging local changes into working copy"
0
-        merge_changes(from, to, tmpdir)
0
-        remember(recall.merge(:lock => lock), to.remember_values)
0
+      def update(to, lock)
0
+        tmpdir = temp_dir_name
0
+        begin
0
+          to.checkout_to(tmpdir)
0
+          logger.info "Copying new changes in place"
0
+          copy_from(to)
0
+          logger.info "Merging local changes into working copy"
0
+          merge_changes(to)
0
+          remember(recall.merge(:lock => lock), to.remember_values)
0
+        ensure
0
+          logger.debug {"Removing temporary directory: #{tmpdir}"}
0
+          tmpdir.rmtree rescue nil
0
+        end
0
       end
0
 
0
-      def merge_changes(from, to, tmpdir)
0
+      def merge_changes(to)
0
         data = svn(:info, yaml_path)
0
         info = YAML.load(data)
0
         initial_revision = info["Last Changed Rev"].to_i

0
@@ -119,11 +119,44 @@ module Piston
0
       recall
0
     end
0
 
0
+    def import(revision, lock)
0
+      repository = revision.repository
0
+      tmpdir = temp_dir_name
0
+      begin
0
+        logger.info {"Checking out the repository"}
0
+        revision.checkout_to(tmpdir)
0
+
0
+        logger.debug {"Creating the local working copy"}
0
+        create
0
+
0
+        logger.info {"Copying from #{revision}"}
0
+        copy_from(revision)
0
+
0
+        logger.debug {"Remembering values"}
0
+        remember(
0
+          {:repository_url => repository.url, :lock => lock, :repository_class => repository.class.name},
0
+          revision.remember_values
0
+        )
0
+
0
+        logger.debug {"Finalizing working copy"}
0
+        finalize
0
+
0
+        logger.info {"Checked out #{repository_url.inspect} #{revision.name} to #{wcdir.inspect}"}
0
+      ensure
0
+        logger.debug {"Removing temporary directory: #{tmpdir}"}
0
+        tmpdir.rmtree rescue nil
0
+      end
0
+    end
0
+
0
     # Update this working copy from +from+ to +to+, which means merging local changes back in
0
     def update(from, to, todir)
0
       logger.debug {"Updating"}
0
     end
0
 
0
+    def temp_dir_name
0
+      path.parent + ".#{path.basename}.tmp"
0
+    end
0
+
0
     protected
0
     # The path to the piston YAML file.
0
     def yaml_path

0
@@ -18,14 +18,14 @@ class Piston::Svn::TestMerging < PistonTestCase
0
     @wc.stubs(:svn).returns()
0
     @wc.expects(:svn).with(:info, @wcdir + ".piston.yml").returns(PISTON_YML_INFO)
0
 
0
-    @wc.merge_changes(@from, @to, @todir)
0
+    @wc.merge_changes(@to)
0
   end
0
 
0
   def test_merging_asks_svn_to_merge_all_changes_since_last_change_plus_one_on_dot_piston_yml_file
0
     @to.stubs(:revision).returns(9999)
0
     @wc.stubs(:svn).with(:info, anything).returns(PISTON_YML_INFO)
0
     @wc.expects(:svn).with(:merge, "--revision", "9223:#{@to.revision}", @wcdir, @wcdir).returns()
0
-    @wc.merge_changes(@from, @to, @todir)
0
+    @wc.merge_changes(@to)
0
   end
0
 
0
   PISTON_YML_INFO = <<-EOF