Changeset 5534

Timestamp:

06/24/09 14:36:23 (3 years ago)

Author:

kaare

Message:

Fix some of the git methods.

File:

• trunk/Padre-Plugin-Git/lib/Padre/Plugin/Git.pm (modified) (9 diffs)

trunk/Padre-Plugin-Git/lib/Padre/Plugin/Git.pm

@@ -29 +29 @@
 cpan install Padre::Plugin::Git
 
-Acces it via Plugin/Git
+Access it via Plugin/Git
 
 
@@ -66 +66 @@
 sub menu_plugins_simple {
     my $self = shift;
+
     return $self->plugin_name => [
         'About'             => sub { $self->show_about },
@@ -133 +134 @@
 sub git_commit_project {
     my ($self) = @_;
-    
+
     my $main = Padre->ide->wx->main;
     my $doc = $main->current->document;
@@ -144 +145 @@
 sub git_status {
     my ($self, $path) = @_;
-    
+
     my $main = Padre->ide->wx->main;
     my $out = capture_merged(sub { system "git status $path" });
@@ -153 +154 @@
 sub git_status_of_file {
     my ($self) = @_;
-    
-    my $main = Padre->ide->wx->main;
-    my $doc = $main->current->document;
-    return $main->error("No document found") if not $doc;
-    $self->git_status($doc->filename);
+
+#   return $main->error("No document found") if not $doc;
+    $self->git_status(_get_current_filename());
     return;
 }
@@ -163 +162 @@
 sub git_status_of_dir {
     my ($self) = @_;
-    
+
     my $main = Padre->ide->wx->main;
     my $doc = $main->current->document;
@@ -176 +175 @@
 sub git_status_of_project {
     my ($self) = @_;
-    
+
     my $main = Padre->ide->wx->main;
     my $doc = $main->current->document;
@@ -192 +191 @@
 sub git_diff {
     my ($self, $path) = @_;
-    
-    my $main = Padre->ide->wx->main;
+
+    use Cwd qw/cwd chdir/;
+    my $cwd = cwd;
+    chdir File::Basename::dirname($path);
     my $out = capture_merged(sub { system "git diff $path" });
-    use Padre::Wx::Dialog::Text;
+    chdir $cwd;
+    require Padre::Wx::Dialog::Text;
+    my $main = Padre->ide->wx->main;
     Padre::Wx::Dialog::Text->show($main, "Git Diff of $path", $out);
 #   $main->message($out, "Git Diff of $path");
+
     return;
 }
 
 sub git_diff_of_file {
+    my ($self) = @_;
+
+    $self->git_diff(_get_current_filename());
+
+    return;
+}
+
+sub git_diff_of_dir {
     my ($self, $path) = @_;
 
     $self->git_diff($path);
 
-    return;
-}
-
-sub git_diff_of_dir {
-    my ($self, $path) = @_;
-
-    $self->git_diff($path);
-
     return;
 }
@@ -231 +235 @@
 
     return;
+}
+
+sub _get_current_filename {
+    my $main = Padre->ide->wx->main;
+    my $doc = $main->current->document;
+
+    return $doc->filename;
+}
+
+
+sub _get_current_filedir {
+    my $main = Padre->ide->wx->main;
+    my $doc = $main->current->document;
+    return $main->error("No document found") if not $doc;
+
+    return File::Basename::dirname($doc->filename);
 }