@matheusbsbs / matheus-bagliano / commits / a446d6bb53
Fork 0

gitweb: Separate ref parsing in git_get_refs_list into parse_ref

Note that for each ref there are usually two calls to git subroutines: first to get the type of ref, second to parse ref if ref is of commit or tag type. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jakub Narebski committed Aug 14, 2006 at 02:07 UTC a446d6bb53cb59f559603c411747d7ac5373e326
1 file changed +45 -35
gitweb/gitweb.perl
+45 -35
@@ -690,6 +690,49 @@ sub parse_commit {
690 return %co;
691 }
692
693 +# parse ref from ref_file, given by ref_id, with given type
694 +sub parse_ref {
695 + my $ref_file = shift;
696 + my $ref_id = shift;
697 + my $type = shift || git_get_type($ref_id);
698 + my %ref_item;
699 +
700 + $ref_item{'type'} = $type;
701 + $ref_item{'id'} = $ref_id;
702 + $ref_item{'epoch'} = 0;
703 + $ref_item{'age'} = "unknown";
704 + if ($type eq "tag") {
705 + my %tag = parse_tag($ref_id);
706 + $ref_item{'comment'} = $tag{'comment'};
707 + if ($tag{'type'} eq "commit") {
708 + my %co = parse_commit($tag{'object'});
709 + $ref_item{'epoch'} = $co{'committer_epoch'};
710 + $ref_item{'age'} = $co{'age_string'};
711 + } elsif (defined($tag{'epoch'})) {
712 + my $age = time - $tag{'epoch'};
713 + $ref_item{'epoch'} = $tag{'epoch'};
714 + $ref_item{'age'} = age_string($age);
715 + }
716 + $ref_item{'reftype'} = $tag{'type'};
717 + $ref_item{'name'} = $tag{'name'};
718 + $ref_item{'refid'} = $tag{'object'};
719 + } elsif ($type eq "commit"){
720 + my %co = parse_commit($ref_id);
721 + $ref_item{'reftype'} = "commit";
722 + $ref_item{'name'} = $ref_file;
723 + $ref_item{'title'} = $co{'title'};
724 + $ref_item{'refid'} = $ref_id;
725 + $ref_item{'epoch'} = $co{'committer_epoch'};
726 + $ref_item{'age'} = $co{'age_string'};
727 + } else {
728 + $ref_item{'reftype'} = $type;
729 + $ref_item{'name'} = $ref_file;
730 + $ref_item{'refid'} = $ref_id;
731 + }
732 +
733 + return %ref_item;
734 +}
735 +
736 ## ......................................................................
737 ## parse to array of hashes functions
738
@@ -709,44 +752,11 @@ sub git_get_refs_list {
752 foreach my $ref_file (@refs) {
753 my $ref_id = git_get_hash_by_ref("$project/$ref_dir/$ref_file");
754 my $type = git_get_type($ref_id) || next;
712 - my %ref_item;
713 - my %co;
714 - $ref_item{'type'} = $type;
715 - $ref_item{'id'} = $ref_id;
716 - $ref_item{'epoch'} = 0;
717 - $ref_item{'age'} = "unknown";
718 - if ($type eq "tag") {
719 - my %tag = parse_tag($ref_id);
720 - $ref_item{'comment'} = $tag{'comment'};
721 - if ($tag{'type'} eq "commit") {
722 - %co = parse_commit($tag{'object'});
723 - $ref_item{'epoch'} = $co{'committer_epoch'};
724 - $ref_item{'age'} = $co{'age_string'};
725 - } elsif (defined($tag{'epoch'})) {
726 - my $age = time - $tag{'epoch'};
727 - $ref_item{'epoch'} = $tag{'epoch'};
728 - $ref_item{'age'} = age_string($age);
729 - }
730 - $ref_item{'reftype'} = $tag{'type'};
731 - $ref_item{'name'} = $tag{'name'};
732 - $ref_item{'refid'} = $tag{'object'};
733 - } elsif ($type eq "commit"){
734 - %co = parse_commit($ref_id);
735 - $ref_item{'reftype'} = "commit";
736 - $ref_item{'name'} = $ref_file;
737 - $ref_item{'title'} = $co{'title'};
738 - $ref_item{'refid'} = $ref_id;
739 - $ref_item{'epoch'} = $co{'committer_epoch'};
740 - $ref_item{'age'} = $co{'age_string'};
741 - } else {
742 - $ref_item{'reftype'} = $type;
743 - $ref_item{'name'} = $ref_file;
744 - $ref_item{'refid'} = $ref_id;
745 - }
755 + my %ref_item = parse_ref($ref_file, $ref_id, $type);
756
757 push @reflist, \%ref_item;
758 }
749 - # sort tags by age
759 + # sort refs by age
760 @reflist = sort {$b->{'epoch'} <=> $a->{'epoch'}} @reflist;
761 return \@reflist;
762 }