piston 1.0.0 → 1.0.1

data/CHANGELOG

@@ -1,4 +1,11 @@
 *SVN*
 
+2006-08-24 1.0.1
+* Corrected minor bug where the core extensions were in core_ext/core_ext
+  instead of being in core_ext.
+* Require the parent working copy path be at HEAD before importing / updating.
+* Don't do unnecessary merges if the file had not changed prior to the update.
+* During the update, if adding a folder, do an svn mkdir instead of a cp_r.
+
 2006-08-24 1.0.0
 * Initial version

data/lib/piston/commands/import.rb

@@ -14,6 +14,10 @@ module Piston
           FileUtils.rm_rf(dir)
         end
 
+        my_info = YAML::load(svn(:info, File.join(dir, '..')))
+	my_revision = YAML::load(svn(:info, my_info['URL']))['Revision']
+	raise Piston::CommandError, "#{File.expand_path(File.join(dir, '..'))} is out of date - run svn update" unless my_info['Revision'] == my_revision
+
         info = YAML::load(svn(:info, repos))
         options = [:export]
         options << ['--revision', revision] if revision
@@ -30,7 +34,7 @@ module Piston
         svn :propset, Piston::ROOT, repos, dir
         svn :propset, Piston::UUID, info['Repository UUID'], dir
         svn :propset, Piston::REMOTE_REV, revision, dir
-        svn :propset, Piston::LOCAL_REV, YAML::load(svn(:info))['Last Changed Rev'], dir
+        svn :propset, Piston::LOCAL_REV, my_revision, dir
         svn :propset, Piston::LOCKED, revision, dir if lock
 
         logging_stream.puts "Exported r#{revision} from '#{repos}' to '#{dir}'"

data/lib/piston/commands/update.rb

@@ -25,8 +25,8 @@ module Piston
         new_remote_rev = info['Last Changed Rev'].to_i
         next skip(dir, "unchanged from revision #{remote_revision}") if remote_revision == new_remote_rev
 
-        info = YAML::load(svn(:info))
-        new_local_rev = info['Last Changed Rev']
+        info = YAML::load(svn(:info, File.join(dir, '..')))
+        new_local_rev = info['Revision']
 
         revisions = (remote_revision .. (revision || new_remote_rev))
         svn :checkout, '--ignore-externals', '--revision', revisions.first, repos, dir.tmp
@@ -40,10 +40,14 @@ module Piston
 
           case op
           when 'A'
-            copy(dir, file)
-            svn :add, File.join(dir, file)
+            if File.directory?(File.join(dir.tmp, file)) then
+	      svn :mkdir, File.join(dir, file)
+	    else
+              copy(dir, file)
+              svn :add, '--force', File.join(dir, file)
+	    end
           when 'D'
-            svn :remove, File.join(dir, file)
+            svn :remove, '--force', File.join(dir, file)
           else
             copy(dir, file)
             merges << file
@@ -51,8 +55,12 @@ module Piston
         end
 
         merges.each do |file|
-          svn :merge, '--revision', (local_revision.succ .. new_local_rev).to_svn, File.join(dir, file), File.join(dir, file)
-        end unless local_revision == new_local_rev
+	  begin
+            svn :merge, '--quiet', '--revision', (local_revision.succ .. new_local_rev).to_svn, File.join(dir, file), File.join(dir, file)
+	  rescue RuntimeError
+	    next if $!.message =~ /Unable to find repository location for/
+	  end
+        end unless local_revision.succ == new_local_rev
 
         FileUtils.rm_rf dir.tmp
 

data/lib/piston/version.rb

@@ -2,7 +2,7 @@ module Piston
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/piston.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-# $HeadURL: svn://rubyforge.org/var/svn/piston/tags/1.0.0/lib/piston.rb $
+# $HeadURL: svn://rubyforge.org/var/svn/piston/tags/1.0.1/lib/piston.rb $
 # $Id: piston.rb 11 2006-08-25 02:47:12Z fbos $
 
 require 'yaml'

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 date: 2006-08-25 00:00:00 +00:00
 summary: Piston is a utility that enables merge tracking of remote repositories.
 require_paths: 
@@ -37,9 +37,8 @@ files:
 - lib/core_ext
 - lib/piston
 - lib/piston.rb
-- lib/core_ext/core_ext
-- lib/core_ext/core_ext/string.rb
-- lib/core_ext/core_ext/range.rb
+- lib/core_ext/string.rb
+- lib/core_ext/range.rb
 - lib/piston/commands
 - lib/piston/ui
 - lib/piston/command_error.rb