svn_wc_tree 0.0.9 → 0.0.10

data/README.rdoc

@@ -6,7 +6,7 @@ Subversion (SVN) repository. (See Requirements)
 
 == VERSION:
 
-Version 0.0.9
+Version 0.0.10
 
 NOTE: THIS IS ALPHA QUALITY SOFTWARE, use at your own risk!
 

data/lib/svn_wc_broker.rb

@@ -33,9 +33,9 @@ module SvnWcBroker
   #--
   # this list gets 'evaled' is why
   #++
-  SUPPORTED_ACTIONS = %w(add commit delete info 
-                         revert list ignore diff update 
-                         status)
+  SUPPORTED_ACTIONS = %w(add commit delete info
+                         revert list ignore diff update
+                         status status_show_updates update_selected)
 
   # set abs_path to your configuration file
   def set_conf_file(conf) ; @conf_file = conf ; end
@@ -85,19 +85,20 @@ module SvnWcBroker
       if files and files.to_a.size > 0
         files_striped = ret_just_files_list(
                            process_params_to_list_of_files(files.to_s))
+        #return svn_results debug_request(process_params_to_list_of_files(files.to_s))
         @files = files_striped.to_a.uniq
         #@files.uniq
         #return svn_results debug_request(@files)
 
         # diff need status info
-        if ('diff' == action ) 
+        if ('diff' == action || 'update_selected' == action)
            @files = process_params_to_list_of_files(files.to_s).to_a.uniq
         end
 
       end
       # eval known actions only
       # svn_list takes args # svn_status takes args
-      if action == 'list' || action == 'status' 
+      if action == 'list' || action == 'status' || action == 'status_show_updates'
         eval("svn_#{action}('#{params['filter_re']}','#{params['filter_amt']}','#{params['dir']}')")
       else
         # NOTE only eval known supported actions
@@ -161,6 +162,7 @@ module SvnWcBroker
     return file_status_list unless file_status_list.respond_to?('each')
     file_status_list.each do |f_list_str|
       f_stat, f_name = f_list_str.split(/\s/)
+      next if f_name == 'undefined' # yes the str undefined
       just_files.push(f_name)
     end
     just_files

data/lib/svn_wc_client.rb

@@ -104,10 +104,53 @@ module SvnRepoClient
       repo_entries
   end
 
+  # emulate a svn status -u
+  # returns entries on remote host not on local
+  # shows what files would be updated from an svn up
+
+  def svn_status_show_updates(f_regex=nil, f_amt=nil, dir=nil)
+      get_repo
+      repo_entries = Array.new
+      dir = @repo_root unless dir and not dir.empty?
+      # only way to test
+      # @error = "1.#{f_regex} 2.#{f_amt} 3.#{dir}"
+      # repo_entries.push info_data
+      @current_rev = nil
+      begin
+        @@svn_wc.info(dir).each do |r|
+          @current_rev = r[1] if r[0].to_s == 'rev'
+        end
+      rescue SvnWc::RepoAccessError => e
+        @error = e.message
+        repo_entries.push info_data  
+      ensure
+        if @current_rev.nil?
+          @error = 'Error: Revision Unknown'
+          repo_entries.push info_data
+        end
+      end
+     svn_list(f_regex, f_amt, dir)
+  end
+
+  def not_new_rev(svn_e, ent)
+    lcr = svn_e[:last_changed_rev] rescue nil
+    return true if lcr.nil?
+    # return false if is a new revision
+    #return false if lcr > @current_rev
+    #raise "1.#{enty} 2.#{svn_e[:entry]} 3.#{svn_e.inspect}"
+    if lcr > @current_rev
+      # skip if file is on remote and local, we want remote only
+      return true if File.file?(ent) || File.directory?(ent)
+      return false
+    end
+    true
+  end
+  private :not_new_rev
  
   # diff current to previous (HEAD only)
   # returns diff content
   def svn_diff
+     raise 'svn diff requires file selections!' if @files.nil?
      file_list_diffs = Array.new
      @files.each { |f_list_str|
        f_stat, f_name = f_list_str.split(/\s/)
@@ -131,7 +174,7 @@ module SvnRepoClient
       get_repo
       rev = Array.new
       begin
-        raise 'svn commit requires file list!' if @files.empty?
+        raise 'svn commit requires file list!' if @files.nil?
         @content = "Committed. Revision: #{@@svn_wc.commit(@files)}
                                   Files:
                                   #{@files.join("\n")}"
@@ -148,7 +191,7 @@ module SvnRepoClient
       get_repo
       rev = Array.new
       begin
-        raise 'svn add requires file list!' if @files.empty?
+        raise 'svn add requires file list!' if @files.nil?
         @content = "Added. #{@@svn_wc.add(@files).to_a.join("\n")}"
         rev.push info_data
       rescue SvnWc::RepoAccessError => e
@@ -181,12 +224,53 @@ module SvnRepoClient
       remote_files
   end
 
+  ## update, returns 'updated' message, revision and update data
+  #def svn_update_selected
+  #    get_repo
+  #    remote_files = Array.new
+  #    begin
+  #      #@error = "1.#{@files} 2.#{@files.class} 3.#{@files[1]}"
+  #      #remote_files.push info_data
+  #      raise 'svn update selected requires file list!' if @files.nil?
+  #      @content = 'Updated: Revision '
+  #      @content << @@svn_wc.update(@files.to_s).to_a.join("\n")
+  #      remote_files.push info_data
+  #    rescue SvnWc::RepoAccessError => e
+  #      @error = e.message
+  #      remote_files.push info_data
+  #    end
+  #    remote_files
+  #end
+ 
+  # update, returns 'updated' message, revision and update data
+  def svn_update_selected
+      raise 'svn update selected requires file list!' if @files.nil?
+     remote_files = Array.new
+     @files.each { |f_list_str|
+       f_stat, f_name = f_list_str.split(/\s/)
+       #@error = "1.#{@files} 2.#{@files.class} 3.#{@files[1]}"
+       #remote_files.push info_data
+       begin
+         get_repo
+         @path = f_name
+         #@content = @@svn_wc.diff(f_name).to_s
+         @content = 'Updated: Revision '
+         @content << @@svn_wc.update(f_name).to_s
+         remote_files.push info_data
+       rescue SvnWc::RepoAccessError => e
+         @error = e.message
+         remote_files.push info_data
+       end
+     }
+     remote_files
+  end
+
   # delete
   def svn_delete
       get_repo
       rev = Array.new
       begin
-        raise 'svn delete requires file list!' if @files.empty?
+        raise 'svn delete requires file list!' if @files.nil?
         @content = "Deleted. #{@@svn_wc.delete(@files).to_a.join("\n")}"
         rev.push info_data
       rescue SvnWc::RepoAccessError => e
@@ -215,7 +299,7 @@ module SvnRepoClient
       get_repo
       infos = Array.new
       begin
-        raise 'svn revert requires file list!' if @files.empty?
+        raise 'svn revert requires file list!' if @files.nil?
         @content = "Reverted: #{@@svn_wc.revert(@files)}
                                   Files:
                                   #{@files.join("\n")}"
@@ -254,9 +338,10 @@ module SvnRepoClient
       begin
         l_svn_list = Array.new
         @@svn_wc.list(dir).each { |el|
-          status_info = {}
-          #fqpn = File.join(@repo_root, el[:entry])
           fqpn = File.join(dir, el[:entry])
+          next if not_new_rev(el, fqpn) if @current_rev
+          #fqpn = File.join(@repo_root, el[:entry])
+          status_info = {}
           #status_info[:last_changed_rev] = el[:last_changed_rev]
           status_info[:entry_name] = fqpn
           status_info[:status] = ' '

data/svn_wc_tree/js/swt.js

@@ -97,6 +97,17 @@ $(document).ready(function(){
                           },
               separator_before : true
             },
+            // svn status -u menu option
+            svn_status_u : {
+              label     : 'svn status -u',
+              icon      : '',
+              action    : function (NODE, TREE_OBJ) { 
+                            SVN_ACTION = 'status_show_updates';
+                            TREE_OBJ.callback('beforedata', [NODE, TREE_OBJ]);
+                            $.tree.focused().refresh();//refresh does a http POST
+                          },
+              separator_before : true
+            },
             // svn update menu option
             svn_update : {
               label     : "svn update",
@@ -105,6 +116,14 @@ $(document).ready(function(){
                           },
               separator_before : true
             },
+            // svn update menu option
+            svn_update_u : {
+              label     : "svn update selected",
+              action    : function (NODE, TREE_OBJ) {
+                            post_req_svn_resp('update_selected');
+                          },
+              separator_before : true
+            },
             // svn diff menu option
             svn_diff : {
               label     : 'svn diff',
@@ -416,7 +435,7 @@ $(document).ready(function(){
            // just repo root sent, other files not seen!?
            if (info[1] === undefined) abs_pn = info[1] + ' ' + info[0];
 
-           svn_files.push(abs_pn);
+           if (abs_pn != undefined) svn_files.push(abs_pn);
          }
          //console.log(svn_files);
        }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svn_wc_tree
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - David Wright
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 -08:00
+date: 2012-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: []