svnx 2.8.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee2f457c3e6d933420b413b096eedae95a3decbc
-  data.tar.gz: bf37347ef5a34295118aad381c99989654f691b8
+  metadata.gz: d1e8e4a0e4c8becac18da9d39aaeb0f9db52e683
+  data.tar.gz: 247d8f5ba0974ba965066ef6058f073c53020757
 SHA512:
-  metadata.gz: 7bb4a5fb1970c4f169b8127980535f15ce625fc197b750cf6b630802c43e3cc8976605f44e56bd645bd0d2ed6c0a9cabcc6c4903fe73f3037d541c5cc54ef2fc
-  data.tar.gz: 5e5460362594822a2e48a1b59ab1b72523c1de289348568a9b80a42071fa41c59cc100a0416375a5ea9a1f14a968db1930f9fd9a34cdeab801f0ed3a411f1930
+  metadata.gz: 79e7e4bfad279b50d113d905cfba6ce0b8faffa1bddf7bfd11b67ac7dd8c841934369de3e2846dbd0ea7e4e31eae128770579e0de5a043cf25790c8f49e560c9
+  data.tar.gz: d4ad3cf461a5ff4d26635e452b3c056ad8edbacbcdf652a6a703d115b8025cb8cda70d90b19acd786ff76903ef3b59df84153ef8111a637f32a734990c4028ff

data/lib/svnx/base/cmdline.rb

@@ -1,19 +1,11 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'logue/loggable'
 require 'command/cacheable/command'
 require 'svnx/base/env'
 
-module Svnx
-  module Base
-  end
-end
-
 module Svnx::Base
   class CommandLine
-    include Logue::Loggable
-
     attr_reader :output
     attr_reader :error
     attr_reader :status  
@@ -25,12 +17,19 @@ module Svnx::Base
       @args = args
     end
 
+    def command
+      Array.new.tap do |a|
+        a << 'svn'
+        a << @subcommand
+        if @xml
+          a << '--xml'
+        end
+        a.concat @args
+      end
+    end
+
     def execute
-      cmdargs = [ 'svn', @subcommand ]
-      cmdargs << '--xml' if @xml
-      cmdargs.concat @args
-      
-      cmdline = command_line cmdargs
+      cmdline = ::Command::Cacheable::Command.new command, caching: @caching, cachedir: Svnx::Env.instance.cache_dir
       cmdline.execute
       
       @output = cmdline.output
@@ -39,9 +38,5 @@ module Svnx::Base
 
       @output
     end
-
-    def command_line cmdargs
-      ::Command::Cacheable::Command.new cmdargs, caching: @caching, cachedir: Svnx::Env.instance.cache_dir
-    end
   end
 end

data/lib/svnx/base/command.rb

@@ -3,7 +3,9 @@
 
 require 'logue/loggable'
 require 'svnx/util/classutil'
+require 'svnx/base/options'
 require 'svnx/base/command_factory'
+require 'svnx/base/command_line_factory'
 
 module Svnx::Base
   class Command
@@ -26,52 +28,40 @@ module Svnx::Base
     attr_reader :output
     attr_reader :error
     attr_reader :status
-    attr_reader :options
     
-    def initialize options, cmdlinecls: nil, optcls: nil, xml: false, caching: caching?
-      debug "options: #{options}"
-      factory = CommandFactory.new
+    def initialize options, cmdlinecls: nil, caching: caching?
+      cmdargs = read_options options
 
-      params = factory.create self.class, cmdlinecls: cmdlinecls, optcls: optcls
-      
-      optcls ||= params.options
-      debug "optcls: #{optcls}"
-      
-      @options = optcls.new options
-      cmdargs = @options.to_args
-      debug "cmdargs: #{cmdargs}"
-      
-      subcommand = params.subcommand
-      
-      cmdlinecls ||= params.cmdline
-
-      debug "subcommand: #{subcommand}"
-      
-      @cmdline = cmdlinecls.new(subcommand: subcommand, xml: xml, caching: caching, args: cmdargs)
-      debug "@cmdline: #{@cmdline}"
+      if cmdlinecls
+        @cmdline = cmdlinecls.new subcommand: subcommand, xml: xml?, caching: caching, args: cmdargs
+      else
+        cmdfactory = CommandFactory.new
+        clfactory = cmdfactory.command_line_factory
+        @cmdline = clfactory.create subcommand: subcommand, xml: xml?, caching: caching, args: cmdargs
+      end
       
       @output = @cmdline.execute
-      debug "@output: #{@output}"
-      
       @error = @cmdline.error
       @status = @cmdline.status
     end
-  end
 
-  class EntriesCommand < Command
-    attr_reader :entries
-    
-    def initialize options, cmdlinecls: CommandLine, caching: caching?, xml: true, entries_class: nil
-      super options, cmdlinecls: cmdlinecls, xml: xml, caching: caching
-      
-      if not @output.empty?
-        entries_class ||= begin
-                            modl = ClassUtil.find_module self.class
-                            modl::Entries
-                          end
-        
-        @entries = entries_class.new @output
-      end
+    def xml?
+      false
+    end
+
+    def read_options args
+      opts = options_class.new args
+      opts.to_args
+    end
+
+    def options_class
+      modl = ClassUtil.find_module self.class
+      modl::Options
+    end
+
+    def subcommand
+      melements = ClassUtil.module_elements self.class
+      melements[-1].downcase
     end
   end
 end

data/lib/svnx/base/command_factory.rb

@@ -8,29 +8,33 @@ module Svnx::Base
   class CommandParams
     attr_reader :options
     attr_reader :subcommand
-    attr_reader :cmdline
 
-    def initialize options: nil, subcommand: nil, cmdline: nil
+    def initialize options: nil, subcommand: nil
       @options = options
       @subcommand = subcommand
-      @cmdline = cmdline
     end
   end
   
   class CommandFactory
     include Logue::Loggable
+
+    def initialize cmdlinefactory = CommandLineFactory.new
+      @cmdlinefactory = cmdlinefactory
+    end
     
-    def create cmdcls, cmdlinecls: nil, optcls: nil
+    def create cmdcls, cmdlinecls: nil
       melements = ClassUtil.module_elements cmdcls
       
-      optcls ||= begin
-                   modl = ClassUtil.find_module cmdcls
-                   modl::Options
-                 end
-
-      cmdlinecls ||= CommandLine
+      optcls = begin
+                 modl = ClassUtil.find_module cmdcls
+                 modl::Options
+               end
+      
+      CommandParams.new options: optcls, subcommand: melements[-1].downcase
+    end
 
-      CommandParams.new options: optcls, subcommand: melements[-1].downcase, cmdline: cmdlinecls 
+    def command_line_factory
+      @cmdlinefactory
     end
   end
 end

data/lib/svnx/base/command_line_factory.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'logue/loggable'
+require 'svnx/base/command_factory'
+
+module Svnx::Base
+  class CommandLineFactory
+    include Logue::Loggable
+    
+    def create params: nil, subcommand: nil, cls: nil, xml: nil, caching: nil, args: nil
+      cls ||= CommandLine
+      subcommand ||= params.subcommand
+      cls.new subcommand: subcommand, xml: xml, caching: caching, args: args
+    end
+  end
+end

data/lib/svnx/base/entries_command.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/util/classutil'
+require 'svnx/base/command'
+
+module Svnx::Base
+  class EntriesCommand < Command
+    attr_reader :entries
+    
+    def initialize options, cmdlinecls: nil, caching: caching?
+      super options, cmdlinecls: cmdlinecls, caching: caching
+      
+      @entries = if not @output.empty?
+                   entries_class = begin
+                                     modl = ClassUtil.find_module self.class
+                                     modl::Entries
+                                   end
+                   entries_class.new @output
+                 end
+    end
+
+    def xml?
+      true
+    end
+  end
+end

data/lib/svnx/{util/objutil.rb → base/fields.rb}

@@ -1,8 +1,10 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-module Svnx
-  module ObjectUtil
+require 'svnx/util/strutil'
+
+module Svnx::Base
+  module Fields
     # shortcut for "@var = args[:var]", for multiple variable names, which are symbols.
     def assign args, symbols = Array.new
       symbols.each do |symbol|
@@ -27,7 +29,8 @@ module Svnx
     end
 
     def fields
-      self.class.instance_variable_get '@fields'
+      varname = '@fields'
+      self.class.instance_variable_defined?(varname) && self.class.instance_variable_get(varname)
     end
 
     module ClassMethods
@@ -39,17 +42,14 @@ module Svnx
       # Creates a reader method for each field, and assigns and validates them from an initialize
       # method, which is also created.
       def has_fields fields = Hash.new
-        @fields ||= Hash.new
-        @fields.merge! fields
-
-        fields.keys.each do |field|
-          attr_reader field
+        fields.each do |name, arg|
+          has_field name, arg
         end        
       end
 
       def has_field name, arg
         @fields ||= Hash.new
-        @fields.merge! name => arg
+        @fields[name] = arg
         
         attr_reader name
       end

data/lib/svnx/base/options.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/util/objutil'
-require 'svnx/util/strutil'
+require 'svnx/base/fields'
+require 'svnx/base/tags'
 
 module Svnx
   module Base
@@ -11,65 +11,9 @@ end
 
 module Svnx::Base
   class Options
-    include Svnx::ObjectUtil
-
-    class << self
-      def mapping field
-        case field
-        when :revision
-          to_args "-r", field
-        when :ignorewhitespace, :ignore_whitespace
-          %w{ -x -bw -x --ignore-eol-style }
-        when :paths
-          nil
-        when :path
-          nil
-        when :urls
-          nil
-        when :url
-          nil
-        when :file
-          to_args "--file", field
-        else
-          raise "invalid field '#{field}'"
-        end
-      end
-
-      def has(*fields)
-        fields.each do |field|
-          arg = mapping field
-          has_field field, arg
-        end
-      end
-
-      def to_args tagname, methname
-        Proc.new { |obj| [ tagname, obj.send(methname) ] }
-      end
-
-      def to_tag sym, invoke = nil
-        tag = "--" + StringUtil.with_dashes(sym)
-        if invoke
-          Proc.new { |x| [ tag, x.send(sym) ] }
-        else
-          tag
-        end
-      end
-
-      def has_tag_field name
-        has_field name, to_tag(name)
-      end
-
-      def has_tag_fields(*names)
-        names.each do |name|
-          has_tag_field name
-        end
-      end
-
-      def has_tag_argument tagname, methname
-        has_field methname, to_args(tagname, methname)
-      end
-    end
-
+    include Svnx::Base::Tags
+    include Svnx::Base::Fields
+    
     def initialize args
       fkeys = fields.keys
       

data/lib/svnx/base/tags.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'svnx/util/strutil'
+
+module Svnx::Base
+  module Tags
+    module ClassMethods
+      # common options/tags
+      def mapping field
+        case field
+        when :revision
+          to_args "-r", field
+        when :ignorewhitespace, :ignore_whitespace
+          %w{ -x -bw -x --ignore-eol-style }
+        when :paths
+          nil
+        when :path
+          nil
+        when :urls
+          nil
+        when :url
+          nil
+        when :file
+          to_args "--file", field
+        else
+          raise "invalid field '#{field}'"
+        end
+      end
+
+      def has(*fields)
+        fields.each do |field|
+          arg = mapping field
+          has_field field, arg
+        end
+      end
+
+      def to_args tagname, methname
+        Proc.new { |obj| [ tagname, obj.send(methname) ] }
+      end
+
+      def to_tag sym, invoke = nil
+        tag = "--" + Svnx::StringUtil.with_dashes(sym)
+        if invoke
+          Proc.new { |x| [ tag, x.send(sym) ] }
+        else
+          tag
+        end
+      end
+
+      def has_tag_field name
+        has_field name, to_tag(name)
+      end
+
+      def has_tag_fields(*names)
+        names.each do |name|
+          has_tag_field name
+        end
+      end
+
+      def has_tag_argument tagname, methname
+        has_field methname, to_args(tagname, methname)
+      end
+    end
+
+    extend ClassMethods
+
+    def self.included other
+      other.extend ClassMethods
+    end
+  end
+end

data/lib/svnx/blame/command.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/blame/options'
-require 'svnx/base/command'
+require 'svnx/base/entries_command'
 
 module Svnx::Blame
   class Command < Svnx::Base::EntriesCommand

data/lib/svnx/diff/command.rb

@@ -10,7 +10,7 @@ module Svnx::Diff
     attr_reader :entries
     
     def initialize cmdopts, cmdlinecls: Svnx::Base::CommandLine
-      super cmdopts, cmdlinecls: cmdlinecls, xml: false, caching: true
+      super cmdopts, cmdlinecls: cmdlinecls, caching: true
       if @output
         @entries = Svnx::Diff::Parser.new.parse_all_output @output.dup
       end

data/lib/svnx/info/command.rb

@@ -3,7 +3,7 @@
 
 require 'svnx/info/options'
 require 'svnx/info/entries'
-require 'svnx/base/command'
+require 'svnx/base/entries_command'
 
 module Svnx::Info
   class Command < Svnx::Base::EntriesCommand

data/lib/svnx/log/command.rb

@@ -3,7 +3,7 @@
 
 require 'svnx/log/options'
 require 'svnx/log/entries'
-require 'svnx/base/command'
+require 'svnx/base/entries_command'
 
 module Svnx::Log
   class Command < Svnx::Base::EntriesCommand

data/lib/svnx/log/entrypath.rb

@@ -17,8 +17,7 @@ module Svnx::Log
     def initialize attr: nil, kind: nil, action: nil, name: nil, prop_mods: nil, text_mods: nil
       if attr
         @kind = attribute_value attr, 'kind'
-        act = attribute_value attr, 'action'
-        @action = Svnx::Action.new act
+        @action = Svnx::Action.new(attribute_value attr, 'action')
         @name = attr.text
         @prop_mods = "true" == attribute_value(attr, 'prop-mods')
         @text_mods = "true" == attribute_value(attr, 'text-mods')
@@ -35,6 +34,10 @@ module Svnx::Log
       @name
     end
 
+    def inspect
+      to_s
+    end
+
     def <=> other
       name <=> other.name
     end

data/lib/svnx/project.rb

@@ -65,3 +65,4 @@ class Svnx::Project
     where.to_s
   end  
 end
+

data/lib/svnx/propget/command.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'svnx/propget/options'
-require 'svnx/base/command'
+require 'svnx/base/entries_command'
 
 module Svnx::Propget
   class Command < Svnx::Base::EntriesCommand

data/lib/svnx/status/command.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'svnx/base/command'
 require 'svnx/status/options'
 require 'svnx/status/entries'
+require 'svnx/base/entries_command'
 
 module Svnx::Status
   class Command < Svnx::Base::EntriesCommand

data/lib/svnx/status/entries.rb

@@ -11,9 +11,13 @@ module Svnx::Status
       super lines
     end
 
+    def xpath
+      '//status/target/entry'
+    end
+
     def get_elements doc
       if $use_nokogiri
-        doc.xpath '//status/target/entry'
+        doc.xpath xpath
       else
         # status/target
         doc.elements['status'].elements['target'].elements

data/lib/svnx/status/entry.rb

@@ -13,25 +13,22 @@ module Svnx::Status
   class Entry < Svnx::Base::Entry
     include Comparable
     
-    attr_reader :status
-    attr_reader :path
-    attr_reader :status_revision
-    attr_reader :action
     attr_reader :commit_revision
     attr_reader :name
+    attr_reader :path
+    attr_reader :status
+    attr_reader :status_revision
 
     def initialize xmlelement, rootpath: nil
       @rootpath = rootpath
       super xmlelement
-      # @status is an Svnx::Action
-      @action = @status
     end
 
     def set_from_element elmt
       set_attr_var elmt, 'path'
 
       wcstatus = elmt.at_xpath 'wc-status'
-      @status = Svnx::Action.new(wcstatus['item'])
+      @status = Svnx::Action.new wcstatus['item']
       set_attr_var wcstatus, 'status_revision', 'revision'
       
       commit = wcstatus.at_xpath 'commit'
@@ -45,7 +42,7 @@ module Svnx::Status
     end
 
     def to_s
-      "path: #{@path}; status: #{@status}"
+      " #{@path}: #{@status}"
     end
 
     def <=> other

data/lib/svnx/util/strutil.rb

@@ -1,14 +1,20 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-class StringUtil
-  class << self
-    def with_dashes x
-      x.to_s.gsub "_", "-"
+module Svnx
+  class StringUtil
+    class << self
+      def with_dashes x
+        x.to_s.gsub "_", "-"
+      end
+
+      def with_underscores x
+        x.to_s.gsub "-", "_"
+      end
     end
 
-    def with_underscores x
-      x.to_s.gsub "-", "_"
+    def to_boolean
+      downcase == "true"
     end
   end
 end

data/lib/svnx/version.rb

@@ -3,5 +3,5 @@
 
 module Svnx
   NAME = 'svnx'
-  VERSION = '2.8.1'
+  VERSION = '2.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svnx
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Jeff Pace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: command-cacheable
@@ -145,10 +145,14 @@ files:
 - lib/svnx/base/cmdline.rb
 - lib/svnx/base/command.rb
 - lib/svnx/base/command_factory.rb
+- lib/svnx/base/command_line_factory.rb
 - lib/svnx/base/entries.rb
+- lib/svnx/base/entries_command.rb
 - lib/svnx/base/entry.rb
 - lib/svnx/base/env.rb
+- lib/svnx/base/fields.rb
 - lib/svnx/base/options.rb
+- lib/svnx/base/tags.rb
 - lib/svnx/blame/command.rb
 - lib/svnx/blame/entries.rb
 - lib/svnx/blame/entry.rb
@@ -181,11 +185,6 @@ files:
 - lib/svnx/propget/options.rb
 - lib/svnx/propset/command.rb
 - lib/svnx/propset/options.rb
-- lib/svnx/revision/argfactory.rb
-- lib/svnx/revision/argument.rb
-- lib/svnx/revision/date.rb
-- lib/svnx/revision/error.rb
-- lib/svnx/revision/range.rb
 - lib/svnx/status/command.rb
 - lib/svnx/status/entries.rb
 - lib/svnx/status/entry.rb
@@ -195,7 +194,6 @@ files:
 - lib/svnx/util/classutil.rb
 - lib/svnx/util/dateutil.rb
 - lib/svnx/util/englishtime.rb
-- lib/svnx/util/objutil.rb
 - lib/svnx/util/strutil.rb
 - lib/svnx/util/timeutil.rb
 - lib/svnx/version.rb

data/lib/svnx/revision/argfactory.rb

@@ -1,55 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module Svnx
-  module Revision
-    RELATIVE_REVISION_RE = Regexp.new '^([\+\-])(\d+)$'
-  end
-end
-
-module Svnx::Revision
-  class ArgumentFactory
-    include Logue::Loggable
-
-    DATE_REGEXP = Regexp.new '^\{(.*?)\}'
-    SVN_ARGUMENT_WORDS = %w{ HEAD BASE COMMITTED PREV }
-
-    def create value, args = Hash.new
-      case value
-      when Fixnum
-        create_for_fixnum value, args
-      when String
-        create_for_string value, args
-      when Symbol
-        raise RevisionError.new "symbol not yet handled"
-      when Date
-        # $$$ this (and Time) will probably have to be converted to svn's format
-        raise RevisionError.new "date not yet handled"
-      when Time
-        raise RevisionError.new "time not yet handled"
-      end          
-    end
-
-    def create_for_fixnum value, args
-      if value < 0
-        # these are log entries:
-        RelativeArgument.new value, entries: args[:entries]
-      else
-        IndexArgument.new value
-      end
-    end
-
-    def create_for_string value, args
-      case 
-      when SVN_ARGUMENT_WORDS.include?(value)
-        StringArgument.new value
-      when md = RELATIVE_REVISION_RE.match(value)
-        RelativeArgument.new md[0].to_i, entries: args[:entries]
-      when DATE_REGEXP.match(value)
-        StringArgument.new value
-      else
-        IndexArgument.new value.to_i
-      end
-    end
-  end
-end

data/lib/svnx/revision/argument.rb

@@ -1,85 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'svnx/log/entries'
-require 'svnx/revision/error'
-require 'logue/loggable'
-require 'svnx/revision/argfactory'
-
-# We represent what svn calls a revision (-r134:{2010-1-1}) as a Range,
-# consisting of a from and to (optional) Argument.
-
-module Svnx
-  module Revision
-  end
-end
-
-module Svnx::Revision
-  class Argument
-    include Logue::Loggable, Comparable
-
-    # Returns the Nth revision from the given logging output.
-    
-    # -n means to count from the end of the list.
-    # +n means to count from the beginning of the list.
-    #  n means the literal revision number.  
-
-    # these are also valid revisions
-    # :working_copy
-    # :head
-
-    attr_reader :value
-
-    class << self
-      def create value, args = Hash.new
-        ArgumentFactory.new.create value, args
-      end
-    end
-
-    def initialize value
-      @value = value
-    end
-
-    def to_s
-      @value.to_s
-    end
-
-    def <=> other
-      @value <=> (other.kind_of?(Argument) ? other.value : other)
-    end
-  end
-end
-
-module Svnx::Revision
-  class IndexArgument < Argument
-  end
-end
-
-module Svnx::Revision
-  class StringArgument < Argument
-  end
-end
-
-# this is of the form -3, which is revision[-3] (second one from the most
-# recent; -1 is the most recent).
-module Svnx::Revision
-  class RelativeArgument < IndexArgument
-    def initialize value, args
-      unless entries = args[:entries]
-        raise RevisionError.new "cannot determine relative revision without entries"
-      end
-      
-      nentries = entries.size
-
-      # logentries are in descending order, so the most recent one is index 0
-
-      if value.abs > nentries
-        raise RevisionError.new "ERROR: no entry for revision: #{value.abs}; number of entries: #{nentries}"
-      else
-        idx = value < 0 ? value.abs - 1 : nentries - value
-        log_entry = entries[idx]
-        super log_entry.revision.to_i
-      end
-    end
-  end
-end

data/lib/svnx/revision/date.rb

@@ -1,27 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module Svnx
-  module Revision
-  end
-end
-
-module Svnx::Revision
-  class DateToDate
-    attr_reader :from
-    attr_reader :to
-    
-    def initialize from, to
-      @from = from
-      @to = to
-    end
-
-    def to_svn_str
-      [ @from, @to ].collect { |dt| "{" + to_svn_date(dt) + "}" }.join(":")
-    end
-    
-    def to_svn_date date
-      date.strftime "%Y-%m-%d"
-    end
-  end
-end

data/lib/svnx/revision/error.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-module Svnx
-  module Revision
-  end
-end
-
-module Svnx::Revision
-  class RevisionError < RuntimeError
-  end
-end

data/lib/svnx/revision/range.rb

@@ -1,54 +0,0 @@
-#!/usr/bin/ruby -w
-# -*- ruby -*-
-
-require 'svnx/log/entries'
-require 'svnx/revision/argument'
-require 'logue/loggable'
-
-module Svnx
-  module Revision
-  end
-end
-
-module Svnx::Revision
-  # this is of the form: -r123:456
-  class Range
-    include Logue::Loggable
-    
-    attr_reader :from
-    attr_reader :to
-
-    def initialize from, to = nil, entries = nil
-      if to
-        @from = to_revision from, entries
-        @to = to_revision to, entries
-      elsif from.kind_of? String
-        @from, @to = from.split(':').collect { |x| to_revision x, entries }
-      else
-        @from = to_revision from, entries
-        @to = :working_copy
-      end
-    end
-
-    def to_revision val, entries
-      val.kind_of?(Argument) ? val : Argument.create(val, entries: entries)
-    end
-    
-    def to_s
-      str = @from.to_s
-      unless working_copy?
-        str << ':' << @to.to_s
-      end
-      str
-    end
-
-    def head?
-      # return true/false instead of true/false/nil
-      @to ? @to.value == 'HEAD' : false
-    end
-
-    def working_copy?
-      @to == nil || @to == :wc || @to == :working_copy
-    end
-  end
-end