piston 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,5 +1,14 @@
 *SVN*
 
+2006-08-30 1.1.1
+* Add contrib/piston [Michael Schuerig]
+* Non-recursively add the root directory of the managed folder then set Piston
+  properties before adding the contents of the managed folder.  This is to
+  help ease work along if an inconsistent EOL is encountered during the
+  import.  The user can finish the import by svn add'ing the rest of the
+  folder until all files are added.  Piston properties will already have been
+  set.
+
 2006-08-26 1.1.0
 * New 'convert' subcommand converts existing svn:externals to Piston managed
   folders.  Thanks to Dan Kubb for the idea.

data/README

@@ -56,6 +56,20 @@ When you want to update again, you unlock:
  'vendor/rails' unlocked.
 
 
+= Contributions
+
+== Bash Shell Completion Script
+
+Michael Schuerig contributed a Bash shell completion script.  You should copy
++contrib/piston+ from your gem repository to the appropriate folder.  Michael
+said:
+
+  I've put together a bash completion function for piston. On Debian, I
+  just put it in /etc/bash_completion.d, alternatively, the contents can
+  be copied to ~/.bash_completion. I don't know how things are organized
+  on other Unix/Linux systems.
+
+
 = Caveats
 
 == Speed

data/Rakefile

@@ -34,7 +34,7 @@ spec = Gem::Specification.new do |s|
   s.executables = ["piston"]
   s.default_executable = "piston"
 
-  s.files = [ "CHANGELOG", "README", "LICENSE", "Rakefile" ] + FileList["{bin,test,lib}/**/*"].to_a
+  s.files = [ "CHANGELOG", "README", "LICENSE", "Rakefile" ] + FileList["{contrib,bin,test,lib}/**/*"].to_a
 
   s.require_path = 'lib'
   s.has_rdoc = false

data/contrib/piston

@@ -0,0 +1,43 @@
+have piston &&
+_piston()
+{
+  local cur prev commands options command
+
+  COMPREPLY=()
+  cur=${COMP_WORDS[COMP_CWORD]}
+
+  commands='update convert help unlock lock import'
+
+  if [[ $COMP_CWORD -eq 1 ]] ; then
+    if [[ "$cur" == -* ]]; then
+      COMPREPLY=( $( compgen -W '--version' -- $cur ) )
+    else
+      COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+    fi
+  else
+
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+    command=${COMP_WORDS[1]}
+
+    if [[ "$cur" == -* ]]; then
+      case $command in
+        @(update|import))
+          options='-r --revision --lock --verbose'
+          ;;
+      esac
+      options="$options --verbose"
+
+      COMPREPLY=( $( compgen -W "$options" -- $cur ) )
+    else
+      if [[ "$command" == @(help|h|\?) ]]; then
+        COMPREPLY=( $( compgen -W "$commands" -- $cur ) )
+      else
+        _filedir
+      fi
+    fi
+  fi
+
+  return 0
+}
+
+[ -n "${have:-}" ] && complete -F _piston $default piston

data/lib/piston/commands/import.rb

@@ -30,13 +30,20 @@ module Piston
           break
         end
 
-        svn :add, '--force', dir
+        # Add so we can set properties
+        svn :add, '--non-recursive', '--force', dir
+
+        # Set the properties
         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, my_revision, dir
         svn :propset, Piston::LOCKED, revision, dir if lock
 
+        # 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
+
         logging_stream.puts "Exported r#{revision} from '#{repos}' to '#{dir}'"
       end
 

data/lib/piston/version.rb

@@ -2,7 +2,7 @@ module Piston
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     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.0
-date: 2006-08-27 00:00:00 +00:00
+  version: 1.1.1
+date: 2006-08-31 00:00:00 +00:00
 summary: Piston is a utility that enables merge tracking of remote repositories.
 require_paths: 
 - lib
@@ -33,6 +33,7 @@ files:
 - README
 - LICENSE
 - Rakefile
+- contrib/piston
 - bin/piston
 - lib/core_ext
 - lib/piston