Changeset 7478

Timestamp:

08/23/09 03:23:38 (2 years ago)

Author:

waxhead

Message:

Big clean up of code.

• removed VCI references.
• removed system calls to svn
• all methods should now use SVN::Class
• waiting on SVN::Class 0.15 with patch for multiline commits then roll out the lib line.

File:

• branches/Padre-Plugin-SVN-waxhead/lib/Padre/Plugin/SVN.pm (modified) (11 diffs)

branches/Padre-Plugin-SVN-waxhead/lib/Padre/Plugin/SVN.pm

@@ -14 +14 @@
 use SVN::Class;
 
-#use Capture::Tiny  qw(capture_merged);
-#use File::Basename ();
-#use File::Spec;
-
-#use VCI;
-
-# because I need a change to commit
-
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 our @ISA     = 'Padre::Plugin';
 
@@ -48 +40 @@
 =head2 Configuring the SVN client for cached authentication.
 
-Becuase this module uses the installed SVN client actions that require authentication from the server will fail and leave Padre looking as though it's hung.
-
-The way to address this is to run the svn client from the command line when asked for the login and password enter as required.
-
-Once done you should now have your authentication details stored.
+Because this module uses the installed SVN client, actions that require authentication from the server will fail and leave Padre looking as though it has hung.
+
+The way to address this is to run the svn client from the command line when asked for the login and password details, enter as required.
+
+Once done you should now have your authentication details cached.
 
 More details can be found here: http://svnbook.red-bean.com/nightly/en/svn.serverconfig.netmodel.html#svn.serverconfig.netmodel.credcache
@@ -103 +95 @@
 
 sub padre_interfaces {
-    'Padre::Plugin' => 0.24;
+    'Padre::Plugin' => 0.43;
 }
 
@@ -178 +170 @@
     my ( $self, $path ) = @_;
     my $main   = Padre->ide->wx->main;
-#   my $status = qx{svn status $path};
 
     my $file = svn_file( $path );
@@ -237 +228 @@
     my ( $self, $path ) = @_;
     my $main   = Padre->ide->wx->main;
-    #my $out = qx{svn log $path};
+    
     my $file = svn_file($path);
     $self->{_busyCursor} = Wx::BusyCursor->new();
@@ -277 +268 @@
     my ( $self, $path ) = @_;
     my $main   = Padre->ide->wx->main;
-    #my $status = qx{svn diff $path};
+    
     my $file = svn_file($path);
     #print $file->stderr;
@@ -305 +296 @@
         #my $doc = Padre::Document->new();
         my $diff_str = join( "\n", @{$file->stdout} );
-        $main->on_new();
+        $main->new_document_from_string($diff_str);
+        #$main->on_new();
         # get the last id created - assume new is created at the end
-        my @ids = $main->pageids;
-        my @docs = $main->documents;
+        #my @ids = $main->pageids;
+        #my @docs = $main->documents;
         #print "pageids: " . join( ",", @ids ) . "\n";
         #print "docs: " . join( ",", @docs ) . "\n";
         #print "last element is: " . $ids[-1] . "\n";
-        my $doc = $docs[$ids[-1]];
-        $doc->text_set($diff_str);
+        #my $doc = $docs[$ids[-1]];
+        #$doc->text_set($diff_str);
         return 1;
     }
@@ -370 +362 @@
         # come after the $message.
         $file->commit_with_message($message);
-        
-        
         
         my @commit = @{$file->stdout};
@@ -382 +372 @@
         }
         
-        #system qq(svn commit "$path" -m"$message");
+        
         $self->{_busyCursor} = undef;
     }
@@ -418 +408 @@
     my $msg = "$path scheduled to be added to " . $file->info->{_url};
     $main->message( $msg );
-    
-    #system "svn add $path";
+
     return;
 }
@@ -432 +421 @@
 }
 
-
-#sub vci {
-#   my ($self, $path) = @_;
-#   my $main = Padre->ide->wx->main;
-#   # TODO: connect to SVN repo without this workaround
-#   my @info = qx{svn info $path};
-#   if (not @info) {
-#       $main->error("$path does not seem to be under SVN");
-#       return;
-#   }
-#   chomp @info;
-#   my ($repo) = grep { $_ =~ /^Repository Root: / } @info;
-#   $repo =~ s/^Repository Root:\s*//;
-#   $main->message("'$repo'", "File");
-#   my $repository = VCI->connect(type => 'Svn', repo => $repo);
-#   print "$repository\n";
-#   print "---\n";
-#   print $repository->projects, "\n";
-#
-#   return;
-#}
-#
-
 1;