piston 1.1.1 → 1.2.0

data/CHANGELOG

@@ -1,4 +1,19 @@
 *SVN*
+* New status subcommand.  Shows M if locally or remotely modified. Applies to
+  one, many, all folders.  This subcommand *requires* the use of a Subversion
+  1.2.0 client.  Thanks to Chris Wanstrath for the inspiration.  His Rake
+  tasks are available at http://errtheblog.com/post/38.
+* Minor patch by Miguel Ibero Carreras to make Subversion always use the
+  C locale, instead of the current one.  This allows Piston to be used
+  with internationalized versions of Subversion.  David Bittencourt later
+  reported the same problem.  Thanks!
+* Better handle how update finds it's latest local revision to prevent
+  conflicts.  If you had never locally changed your vendor repositories,
+  this fix will change nothing for you.  This helps prevent local conflicts
+  if you had ever applied a local patch.
+  *CAVEAT*: See the release announcement at
+            http://blog.teksol.info/articles/2006/11/17/piston-1-2-0-status-better-update
+            for a required local operation.
 
 2006-08-30 1.1.1
 * Add contrib/piston [Michael Schuerig]

data/lib/core_ext/string.rb

@@ -2,4 +2,8 @@ class String
   def tmp
     self + ".tmp"
   end
+
+  def blank?
+    self.empty? || self.strip.empty?
+  end
 end

data/lib/piston/command.rb

@@ -2,7 +2,7 @@ module Piston
   # The base class which all commands subclass to obtain services from.
   class Command
     attr_accessor :revision, :dry_run, :quiet, :verbose, :force, :lock,
-                  :recursive, :logging_stream
+                  :recursive, :logging_stream, :show_updates
 
     # Execute this command.  The arguments are pre-processed to expand any
     # wildcards using Dir#[].  This is because the Windows shell does not
@@ -32,6 +32,7 @@ module Piston
       command = "svn #{args.join(' ')}"
       logging_stream.puts command if verbose
       return if dry_run
+      ENV['LC_ALL'] = 'C'
       result = `#{command}`
       logging_stream.puts result if verbose
       raise "Command #{command} resulted in an error:\n\n#{result}" unless $?.exitstatus.zero?

data/lib/piston/commands/import.rb

@@ -21,6 +21,7 @@ module Piston
         info = YAML::load(svn(:info, repos))
         options = [:export]
         options << ['--revision', revision] if revision
+        options << '--quiet'
         options << repos
         options << dir
         export = svn options
@@ -31,7 +32,7 @@ module Piston
         end
 
         # Add so we can set properties
-        svn :add, '--non-recursive', '--force', dir
+        svn :add, '--non-recursive', '--force', '--quiet', dir
 
         # Set the properties
         svn :propset, Piston::ROOT, repos, dir
@@ -42,7 +43,7 @@ module Piston
 
         # Finish adding.  If we get an error, at least the properties will be
         # set and the user can handle the rest
-        svn :add, '--force', dir
+        svn :add, '--force', '--quiet', dir
 
         logging_stream.puts "Exported r#{revision} from '#{repos}' to '#{dir}'"
       end

data/lib/piston/commands/status.rb

@@ -0,0 +1,79 @@
+require 'pp'
+
+module Piston
+  module Commands
+    class Status < Piston::Command
+      def run(args)
+        # First, find the list of pistoned folders
+        folders = svn(:propget, '--recursive', Piston::ROOT, *args)
+        repos = Hash.new
+        repo = nil
+        folders.each_line do |line|
+          next unless line =~ /(\w.*) - /
+          repos[$1] = Hash.new
+        end
+
+        # Then, get their properties
+        repo = nil
+        svn(:proplist, '--verbose', *repos.keys).each_line do |line|
+          case line
+          when /'([^']+)'/
+            repo = repos[$1]
+          when /(piston:[-\w]+)\s*:\s*(.*)$/
+            repo[$1] = $2
+          end
+        end
+
+        # Determine their local status
+        repos.each_pair do |path, props|
+          log = svn(:log, '--revision', "#{props[Piston::LOCAL_REV]}:HEAD", '--quiet', '--limit', '2', path)
+          props[:locally_modified] = 'M' if log.count("\n") > 3
+        end
+
+        # And their remote status, if required
+        repos.each_pair do |path, props|
+          log = svn(:log, '--revision', "#{props[Piston::REMOTE_REV]}:HEAD", '--quiet', '--limit', '2', props[Piston::ROOT])
+          props[:remotely_modified] = 'M' if log.count("\n") > 3
+        end if show_updates
+
+        # 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]
+        end
+
+        logging_stream.puts "No pistoned folders found" if repos.empty?
+      end
+
+      def self.help
+        "Determines the current status of each pistoned directory"
+      end
+
+      def self.detailed_help(stream)
+        stream.puts <<EOF
+status: #{help}
+usage: status [DIR [DIR...]]
+
+  Shows the status of one, many or all pistoned folders.  The status is
+  returned in columns.
+
+  The first column's values are:
+     :  Locally unchanged (space)
+    M:  Locally modified since importing
+
+  The second column's values are blanks, unless the --show-updates is passed.
+    M:  Remotely modified since importing
+
+  Valid options:
+      --show-updates        : Queries the remote repositories to determine
+                              if they have been updated from our revision.
+
+EOF
+      end
+
+      def self.aliases
+        %w(status st)
+      end
+    end
+  end
+end

data/lib/piston/commands/update.rb

@@ -22,27 +22,42 @@ module Piston
       def update(dir)
         return unless File.directory?(dir)
         return skip(dir, "locked") unless svn(:propget, LOCKED, dir) == ''
-        status = svn :status, '--show-updates', dir
-        return skip(dir, "pending updates -- run \"svn update #{dir}\"") if status.split("\n").size > 1
+        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.print "Processing '#{dir}'...  "
+        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
 
+        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 = info['Last Changed Rev'].to_i
         return skip(dir, "unchanged from revision #{remote_revision}", false) if remote_revision == new_remote_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
+
+        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 r#{revisions.last}"
         updates = svn :update, '--ignore-externals', '--revision', revisions.last, dir.tmp
+
+        logging_stream.puts "  Processing adds/deletes"
         merges = Array.new
         changes = 0
         updates.each_line do |line|
@@ -53,34 +68,44 @@ module Piston
           case op
           when 'A'
             if File.directory?(File.join(dir.tmp, file)) then
-              svn :mkdir, File.join(dir, file)
+              svn :mkdir, '--quiet', File.join(dir, file)
             else
               copy(dir, file)
-              svn :add, '--force', File.join(dir, file)
+              svn :add, '--quiet', '--force', File.join(dir, file)
             end
           when 'D'
-            svn :remove, '--force', File.join(dir, file)
+            svn :remove, '--quiet', '--force', File.join(dir, file)
           else
             copy(dir, file)
             merges << file
           end
         end
 
-        merges.each do |file|
-          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/
+        # 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 unless local_revision.succ == new_local_rev
+        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 #{revisions.last} (#{changes} changes)"
+        logging_stream.puts "  Updated to r#{revisions.last} (#{changes} changes)"
       end
 
       def copy(dir, file)

data/lib/piston/ui/command_line.rb

@@ -10,6 +10,7 @@ module Piston
           [ '--dry-run', GetoptLong::NO_ARGUMENT ],
           [ '--quiet', '-q', GetoptLong::NO_ARGUMENT ],
           [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
+          [ '--show-updates', '-u', GetoptLong::NO_ARGUMENT ],
           [ '--lock', GetoptLong::NO_ARGUMENT ],
           [ '--force', '-f', GetoptLong::NO_ARGUMENT ],
           [ '--version', GetoptLong::NO_ARGUMENT ]

data/lib/piston/version.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: piston
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2006-08-31 00:00:00 +00:00
+  version: 1.2.0
+date: 2006-11-17 00:00:00 +00:00
 summary: Piston is a utility that enables merge tracking of remote repositories.
 require_paths: 
 - lib
@@ -51,6 +51,7 @@ files:
 - lib/piston/commands/import.rb
 - lib/piston/commands/unlock.rb
 - lib/piston/commands/convert.rb
+- lib/piston/commands/status.rb
 - lib/piston/ui/command_line.rb
 test_files: []