Skip to content

Commit

Permalink
gitweb: tree view: hash_base and hash are now context sensitive
Browse files Browse the repository at this point in the history
In tree view, by default, hash_base is HEAD and hash is the
entry equivalent.  Else the user had selected a hash_base or
hash, say by clicking on a revision or commit, in which case
those values are used.

Signed-off-by: Luben Tuikov <ltuikov@yahoo.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
ltuikov authored and Junio C Hamano committed Sep 30, 2006
1 parent 6d81c5a commit 6f7ea5f
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions gitweb/gitweb.perl
Expand Up @@ -1672,9 +1672,9 @@ sub git_print_tree_entry {
"history");
}
print " | " .
$cgi->a({-href => href(action=>"blob_plain",
hash=>$t->{'hash'}, file_name=>"$basedir$t->{'name'}")},
"raw");
$cgi->a({-href => href(action=>"blob_plain", hash_base=>$hash_base,
file_name=>"$basedir$t->{'name'}")},
"raw");
print "</td>\n";

} elsif ($t->{'type'} eq "tree") {
Expand Down Expand Up @@ -2745,14 +2745,14 @@ sub git_blob {
sub git_tree {
my $have_snapshot = gitweb_have_snapshot();

if (!defined $hash_base) {
$hash_base = "HEAD";
}
if (!defined $hash) {
$hash = git_get_head_hash($project);
if (defined $file_name) {
my $base = $hash_base || $hash;
$hash = git_get_hash_by_path($base, $file_name, "tree");
}
if (!defined $hash_base) {
$hash_base = $hash;
$hash = git_get_hash_by_path($hash_base, $file_name, "tree");
} else {
$hash = $hash_base;
}
}
$/ = "\0";
Expand Down

0 comments on commit 6f7ea5f

Please sign in to comment.