gitweb: Add history and blame to git_difftree_body()

Add blame and history to Deleted files.
Add blame and history to Modified or Type changed files.
Add blame and history to Renamed or Copied files.

This allows us to do
blame->commit->blame->commit->blame->...
instead of
blame->commit->file->blame->commit->file->blame->...
which is longer and easier to get wrong.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 88a8bcdbff21c7d4d27379b28c2acf7a135cb4b2..c86ac1dd88ea2dbb81d7ea645f7cee4aa44df53d 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1761,9 +1761,12 @@ sub git_difftree_body {
                                print $cgi->a({-href => "#patch$patchno"}, "patch");
                                print " | ";
                        }
                                print $cgi->a({-href => "#patch$patchno"}, "patch");
                                print " | ";
                        }

+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
+                                                    file_name=>$diff{'file'})},
+                                     "blame") . " | ";

                        print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
                        print $cgi->a({-href => href(action=>"history", hash_base=>$parent,

-                                                    file_name=>$diff{'file'})},
-                                     "history");
+                                                    file_name=>$diff{'file'})},
+                                     "history");

                        print "</td>\n";
 
                } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed
                        print "</td>\n";
 
                } elsif ($diff{'status'} eq "M" || $diff{'status'} eq "T") { # modified, or type changed


@@ -1803,8 +1806,11 @@ sub git_difftree_body {
                                }
                                print " | ";
                        }
                                }
                                print " | ";
                        }

-                       print $cgi->a({-href => href(action=>"history",
-                                                    hash_base=>$hash, file_name=>$diff{'file'})},
+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$hash,
+                                                    file_name=>$diff{'file'})},
+                                     "blame") . " | ";
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$hash,
+                                                    file_name=>$diff{'file'})},

                                      "history");
                        print "</td>\n";
 
                                      "history");
                        print "</td>\n";
 


@@ -1830,17 +1836,22 @@ sub git_difftree_body {
                                if ($action eq 'commitdiff') {
                                        # link to patch
                                        $patchno++;
                                if ($action eq 'commitdiff') {
                                        # link to patch
                                        $patchno++;

-                                       print " | " .
-                                               $cgi->a({-href => "#patch$patchno"}, "patch");
+                                       print $cgi->a({-href => "#patch$patchno"}, "patch");

                                } else {
                                } else {

-                                       print " | " .
-                                               $cgi->a({-href => href(action=>"blobdiff",
-                                                                      hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
-                                                                      hash_base=>$hash, hash_parent_base=>$parent,
-                                                                      file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
-                                                       "diff");
+                                       print $cgi->a({-href => href(action=>"blobdiff",
+                                                                    hash=>$diff{'to_id'}, hash_parent=>$diff{'from_id'},
+                                                                    hash_base=>$hash, hash_parent_base=>$parent,
+                                                                    file_name=>$diff{'to_file'}, file_parent=>$diff{'from_file'})},
+                                                     "diff");

                                }
                                }

+                               print " | ";

                        }
                        }

+                       print $cgi->a({-href => href(action=>"blame", hash_base=>$parent,
+                                                    file_name=>$diff{'from_file'})},
+                                     "blame") . " | ";
+                       print $cgi->a({-href => href(action=>"history", hash_base=>$parent,
+                                                    file_name=>$diff{'from_file'})},
+                                     "history");

                        print "</td>\n";
 
                } # we should not encounter Unmerged (U) or Unknown (X) status
                        print "</td>\n";
 
                } # we should not encounter Unmerged (U) or Unknown (X) status