piston 1.2.1 → 1.3.0

data/CHANGELOG

@@ -1,5 +1,11 @@
 *SVN*
 
+2007-01-22 1.3.0
+* Piston status shows the revision number of locked repositories.  Thanks to
+  Chris Wanstrath <http://errtheblog.com/>.
+* New piston switch subcommand to switch repository locations.  Thanks to
+  Greg Spurrier for the prompt which resulted in finally implementing this.
+
 2006-11-20 1.2.1
 * Import subcommand would fail with a "svn: Explicit target required
   ('vendor/rails' interpreted as prop value)" error.  This was a minor

data/lib/piston.rb

@@ -18,8 +18,8 @@
 # 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.1/lib/piston.rb $
-# $Id: piston.rb 11 2006-08-25 02:47:12Z fbos $
+# $HeadURL: svn+ssh://fbos@rubyforge.org/var/svn/piston/tags/1.3.0/lib/piston.rb $
+# $Id: piston.rb 70 2007-01-22 20:33:35Z fbos $
 
 require 'yaml'
 require 'uri'
@@ -30,10 +30,6 @@ Dir[File.join(PISTON_ROOT, 'core_ext', '*.rb')].each do |file|
   require file
 end
 
-require File.join(PISTON_ROOT, 'piston', 'command')
-require File.join(PISTON_ROOT, 'piston', 'command_error')
-require File.join(PISTON_ROOT, 'piston', 'ui', 'command_line')
-
 module Piston
   ROOT        = "piston:root"
   UUID        = "piston:uuid"
@@ -41,3 +37,7 @@ module Piston
   LOCAL_REV   = "piston:local-revision"
   LOCKED      = "piston:locked"
 end
+
+require File.join(PISTON_ROOT, 'piston', 'command')
+require File.join(PISTON_ROOT, 'piston', 'command_error')
+require File.join(PISTON_ROOT, 'piston', 'ui', 'command_line')

data/lib/piston/commands/status.rb

@@ -38,8 +38,8 @@ module Piston
 
         # Display the results
         repos.each_pair do |path, props|
-          logging_stream.printf "%1s%1s     %s (%s)\n", props[:locally_modified],
-              props[:remotely_modified], path, props[Piston::ROOT]
+          logging_stream.printf "%1s%1s    %5s %s (%s)\n", props[:locally_modified],
+              props[:remotely_modified], props[Piston::LOCKED], path, props[Piston::ROOT]
         end
 
         logging_stream.puts "No pistoned folders found" if repos.empty?

data/lib/piston/commands/switch.rb

@@ -0,0 +1,144 @@
+module Piston
+  module Commands
+    class Switch < Piston::Command
+      def run(args)
+        new_root, dir = args.shift, args.shift
+        raise Piston::CommandError, "Expected two arguments only to switch.  Unrecognized arguments: #{args.inspect}" unless args.empty?
+        switch(dir, new_root)
+      end
+
+      def switch(dir, new_repos)
+        return unless File.directory?(dir)
+        return skip(dir, "locked") unless svn(:propget, LOCKED, dir) == ''
+        status = svn(:status, '--show-updates', dir)
+        new_local_rev = nil
+        new_status = Array.new
+        status.each_line do |line|
+          if line =~ /status.+\s(\d+)$/i then
+            new_local_rev = $1.to_i
+          else
+            new_status << line unless line =~ /^\?/
+          end
+        end
+        raise "Unable to parse status\n#{status}" unless new_local_rev
+        return skip(dir, "pending updates -- run \"svn update #{dir}\"\n#{new_status}") if new_status.size > 0
+
+        logging_stream.puts "Processing '#{dir}'..."
+        repos = svn(:propget, Piston::ROOT, dir).chomp
+        uuid = svn(:propget, Piston::UUID, dir).chomp
+        remote_revision = svn(:propget, Piston::REMOTE_REV, dir).chomp.to_i
+        local_revision = svn(:propget, Piston::LOCAL_REV, dir).chomp.to_i
+        local_revision = local_revision.succ
+
+        new_info = YAML::load(svn(:info, new_repos))
+        raise Piston::CommandError unless uuid == new_info['Repository UUID']
+
+        logging_stream.puts "  Fetching remote repository's latest revision and UUID"
+        info = YAML::load(svn(:info, repos))
+        return skip(dir, "Repository UUID changed\n  Expected #{uuid}\n  Found    #{info['Repository UUID']}\n  Repository: #{repos}") unless uuid == info['Repository UUID']
+
+        new_remote_rev = new_info['Last Changed Rev'].to_i
+        return skip(dir, "unchanged from revision #{remote_revision}", false) if remote_revision == new_remote_rev
+
+        revisions = (remote_revision .. (revision || new_remote_rev))
+
+        logging_stream.puts "  Restoring remote repository to known state at r#{revisions.first}"
+        svn :checkout, '--ignore-externals', '--quiet', '--revision', revisions.first, repos, dir.tmp
+
+        logging_stream.puts "  Updating remote repository to #{new_repos}@#{revisions.last}"
+        updates = svn :switch, '--revision', revisions.last, new_repos, dir.tmp
+
+        logging_stream.puts "  Processing adds/deletes"
+        merges = Array.new
+        changes = 0
+        updates.each_line do |line|
+          next unless line =~ %r{^([A-Z]).*\s+#{Regexp.escape(dir.tmp)}[\\/](.+)$}
+          op, file = $1, $2
+          changes += 1
+
+          case op
+          when 'A'
+            if File.directory?(File.join(dir.tmp, file)) then
+              svn :mkdir, '--quiet', File.join(dir, file)
+            else
+              copy(dir, file)
+              svn :add, '--quiet', '--force', File.join(dir, file)
+            end
+          when 'D'
+            svn :remove, '--quiet', '--force', File.join(dir, file)
+          else
+            copy(dir, file)
+            merges << file
+          end
+        end
+
+        # Determine if there are any local changes in the pistoned directory
+        log = svn(:log, '--quiet', '--revision', (local_revision .. new_local_rev).to_svn, '--limit', '2', dir)
+
+        # If none, we skip the merge process
+        if local_revision < new_local_rev && log.count("\n") > 3 then
+          logging_stream.puts "  Merging local changes back in"
+          merges.each do |file|
+            begin
+              svn(:merge, '--quiet', '--revision', (local_revision .. 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
+        end
+
+        logging_stream.puts "  Removing temporary files / folders"
+        FileUtils.rm_rf dir.tmp
+
+        logging_stream.puts "  Updating Piston properties"
+        svn :propset, Piston::REMOTE_REV, revisions.last, dir
+        svn :propset, Piston::LOCAL_REV, new_local_rev, dir
+        svn :propset, Piston::LOCKED, revisions.last, dir if lock
+
+        logging_stream.puts "  Updated to r#{revisions.last} (#{changes} changes)"
+      end
+
+      def copy(dir, file)
+        FileUtils.cp(File.join(dir.tmp, file), File.join(dir, file))
+      end
+
+      def skip(dir, msg, header=true)
+        logging_stream.print "Skipping '#{dir}': " if header
+        logging_stream.puts msg
+      end
+
+      def self.help
+        "Switches a single directory to a new repository root"
+      end
+
+      def self.detailed_help(stream)
+        stream.puts <<EOF
+switch: #{help}
+usage: switch NEW_REPOSITORY_ROOT DIR
+
+  This operation changes the remote location from A to B, keeping local
+  changes.  If any local modifications were done, they will be preserved.
+  If merge conflicts occur, they will not be taken care of, and your subsequent
+  commit will fail.
+
+  Piston will refuse to update a folder if it has pending updates.  Run
+  'svn update' on the target folder to update it before running Piston
+  again.
+
+    Valid options:
+      -r [--revision] arg   : Update to ARG instead of HEAD
+      --lock                : Close down and lock the folder from future
+                              updates immediately
+      --verbose             : Show Subversion commands and results as they
+                              are executed
+
+EOF
+      end
+
+      def self.aliases
+        %w(switch sw)
+      end
+    end
+  end
+end

data/lib/piston/commands/update.rb

@@ -21,7 +21,7 @@ module Piston
 
       def update(dir)
         return unless File.directory?(dir)
-        return skip(dir, "locked") unless svn(:propget, LOCKED, dir) == ''
+        return skip(dir, "locked") unless svn(:propget, Piston::LOCKED, dir) == ''
         status = svn(:status, '--show-updates', dir)
         new_local_rev = nil
         new_status = Array.new

data/lib/piston/version.rb

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

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.0.8
 specification_version: 1
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
-date: 2006-11-20 00:00:00 +00:00
+  version: 1.3.0
+date: 2007-01-22 00:00:00 +00:00
 summary: Piston is a utility that enables merge tracking of remote repositories.
 require_paths: 
 - lib
@@ -45,6 +45,7 @@ files:
 - lib/piston/command_error.rb
 - lib/piston/command.rb
 - lib/piston/version.rb
+- lib/piston/commands/switch.rb
 - lib/piston/commands/update.rb
 - lib/piston/commands/help.rb
 - lib/piston/commands/lock.rb