@matheusbsbs / matheus-bagliano / commits / 07fef5fc15
Fork 0

blameview: Move the commit info to a pane below the blame window.

Also spawn the the new blameview in the background Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Aneesh Kumar K.V committed Feb 12, 2007 at 23:00 UTC 07fef5fc1599d11f5750ae2440e0da6616c297b8
1 file changed +26 -7
contrib/blameview/blameview.perl
+26 -7
@@ -25,11 +25,12 @@ EOS
25
26 my $window = Gtk2::Window->new('toplevel');
27 $window->signal_connect(destroy => sub { Gtk2->main_quit });
28 +my $vpan = Gtk2::VPaned->new();
29 +$window->add($vpan);
30 my $scrolled_window = Gtk2::ScrolledWindow->new;
29 -$window->add($scrolled_window);
31 +$vpan->pack1($scrolled_window, 1, 1);
32 my $fileview = Gtk2::SimpleList->new(
33 'Commit' => 'text',
32 - 'CommitInfo' => 'text',
34 'FileLine' => 'text',
35 'Data' => 'text'
36 );
@@ -40,8 +41,27 @@ $fileview->set_rules_hint(1);
41 $fileview->signal_connect (row_activated => sub {
42 my ($sl, $path, $column) = @_;
43 my $row_ref = $sl->get_row_data_from_path ($path);
43 - system("blameview @$row_ref[0] $fn");
44 - # $row_ref is now an array ref to the double-clicked row's data.
44 + system("blameview @$row_ref[0] $fn &");
45 + });
46 +
47 +my $commitwindow = Gtk2::ScrolledWindow->new();
48 +$commitwindow->set_policy ('GTK_POLICY_AUTOMATIC','GTK_POLICY_AUTOMATIC');
49 +$vpan->pack2($commitwindow, 1, 1);
50 +my $commit_text = Gtk2::TextView->new();
51 +my $commit_buffer = Gtk2::TextBuffer->new();
52 +$commit_text->set_buffer($commit_buffer);
53 +$commitwindow->add($commit_text);
54 +
55 +$fileview->signal_connect (cursor_changed => sub {
56 + my ($sl) = @_;
57 + my ($path, $focus_column) = $sl->get_cursor();
58 + my $row_ref = $sl->get_row_data_from_path ($path);
59 + my $c_fh;
60 + open($c_fh, '-|', "git cat-file commit @$row_ref[0]")
61 + or die "unable to find commit @$row_ref[0]";
62 + my @buffer = <$c_fh>;
63 + $commit_buffer->set_text("@buffer");
64 + close($c_fh);
65 });
66
67 my $fh;
@@ -50,7 +70,7 @@ open($fh, '-|', "git cat-file blob $hash:$fn")
70
71 while(<$fh>) {
72 chomp;
53 - $fileview->{data}->[$.] = ['HEAD', '?', "$fn:$.", $_];
73 + $fileview->{data}->[$.] = ['HEAD', "$fn:$.", $_];
74 }
75
76 my $blame;
@@ -79,8 +99,7 @@ sub flush_blame_line {
99
100 for(my $i = 0; $i < $cnt; $i++) {
101 @{$fileview->{data}->[$lno+$i-1]}[0,1,2] =
82 - (substr($commit, 0, 8), $info,
83 - $filename . ':' . ($s_lno+$i));
102 + (substr($commit, 0, 8), $filename . ':' . ($s_lno+$i));
103 }
104 }
105