[RFC/PATCH 1/2] gitweb: extend &git_get_head_hash to be &git_get_hash
- From
Mark Rada <marada@uwaterloo.ca>
- Date
- Sep 10, 2009, 21:20 UTC
- Message-ID
- <4AA96D9B.6090003@mailservices.uwaterloo.ca>
This adds an optional second argument to the routine which lets the caller specify a treeish that can be translated to a hash id by rev-parse.
To maintain some backwards compatability, the second argument is optional and it will default to `HEAD' if not specified.
Signed-off-by: Mark Rada <marada@uwaterloo.ca> --- gitweb/gitweb.perl | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 24b2193..d650188 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1981,13 +1981,14 @@ sub quote_command { map { my $a = $_; $a =~ s/(['!])/'\\$1'/g; "'$a'" } @_ ); } -# get HEAD ref of given project as hash -sub git_get_head_hash { +# get object id of given project as full hash, defaults to HEAD +sub git_get_hash { my $project = shift; + my $hash = shift || 'HEAD'; my $o_git_dir = $git_dir; my $retval = undef; $git_dir = "$projectroot/$project"; - if (open my $fd, "-|", git_cmd(), "rev-parse", "--verify", "HEAD") { + if (open my $fd, '-|', git_cmd(), 'rev-parse', '--verify', "$hash") { my $head = <$fd>; close $fd; if (defined $head && $head =~ /^([0-9a-fA-F]{40})$/) { @@ -4737,7 +4738,7 @@ sub git_summary { } sub git_tag { - my $head = git_get_head_hash($project); + my $head = &git_get_hash($project); git_header_html(); git_print_page_nav('','', $head,undef,$head); my %tag = parse_tag($hash); @@ -4778,7 +4779,7 @@ sub git_blame { # error checking die_error(400, "No file name given") unless $file_name; - $hash_base ||= git_get_head_hash($project); + $hash_base ||= &git_get_hash($project); die_error(404, "Couldn't find base commit") unless $hash_base; my %co = parse_commit($hash_base) or die_error(404, "Commit not found"); @@ -4911,7 +4912,7 @@ HTML } sub git_tags { - my $head = git_get_head_hash($project); + my $head = &git_get_hash($project); git_header_html(); git_print_page_nav('','', $head,undef,$head); git_print_header_div('summary', $project); @@ -4924,7 +4925,7 @@ sub git_tags { } sub git_heads { - my $head = git_get_head_hash($project); + my $head = &git_get_hash($project); git_header_html(); git_print_page_nav('','', $head,undef,$head); git_print_header_div('summary', $project); @@ -4942,7 +4943,7 @@ sub git_blob_plain { if (!defined $hash) { if (defined $file_name) { - my $base = $hash_base || git_get_head_hash($project); + my $base = $hash_base || &git_get_hash($project); $hash = git_get_hash_by_path($base, $file_name, "blob") or die_error(404, "Cannot find file"); } else { @@ -4994,7 +4995,7 @@ sub git_blob { if (!defined $hash) { if (defined $file_name) { - my $base = $hash_base || git_get_head_hash($project); + my $base = $hash_base || &git_get_hash($project); $hash = git_get_hash_by_path($base, $file_name, "blob") or die_error(404, "Cannot find file"); } else { @@ -5197,7 +5198,7 @@ sub git_snapshot { } if (!defined $hash) { - $hash = git_get_head_hash($project); + $hash = &git_get_hash($project); } my $name = $project; @@ -5229,7 +5230,7 @@ sub git_snapshot { } sub git_log { - my $head = git_get_head_hash($project); + my $head = &git_get_hash($project); if (!defined $hash) { $hash = $head; } @@ -5833,7 +5834,7 @@ sub git_patches { sub git_history { if (!defined $hash_base) { - $hash_base = git_get_head_hash($project); + $hash_base = &git_get_hash($project); } if (!defined $page) { $page = 0; @@ -5904,7 +5905,7 @@ sub git_search { die_error(400, "Text field is empty"); } if (!defined $hash) { - $hash = git_get_head_hash($project); + $hash = &git_get_hash($project); } my %co = parse_commit($hash); if (!%co) { @@ -6159,7 +6160,7 @@ EOT } sub git_shortlog { - my $head = git_get_head_hash($project); + my $head = &git_get_hash($project); if (!defined $hash) { $hash = $head; } @@ -6486,7 +6487,7 @@ XML foreach my $pr (@list) { my %proj = %$pr; - my $head = git_get_head_hash($proj{'path'}); + my $head = &git_get_hash($proj{'path'}); if (!defined $head) { next; }
-- 1.6.4.2