Code

gitweb: Add parse_commits, used to bulk load commit objects.
authorRobert Fitzsimons <robfitz@273k.net>
Sun, 24 Dec 2006 14:31:42 +0000 (14:31 +0000)
committerJunio C Hamano <junkio@cox.net>
Mon, 25 Dec 2006 18:40:43 +0000 (10:40 -0800)
Add a new method parse_commits which is able to parse multiple commit
objects at once.  Reworked parse_commit to share the commit object
parsing logic.

Signed-off-by: Robert Fitzsimons <robfitz@273k.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
gitweb/gitweb.perl

index d01d68934834ca1aae30c04b1f79b2cadb559d88..6bd57a4e3246e981805ac2ddbf3b33ec5dcbc189 100755 (executable)
@@ -1270,25 +1270,13 @@ sub parse_tag {
        return %tag
 }
 
-sub parse_commit {
-       my $commit_id = shift;
-       my $commit_text = shift;
-
-       my @commit_lines;
+sub parse_commit_text {
+       my ($commit_text) = @_;
+       my @commit_lines = split '\n', $commit_text;
        my %co;
 
-       if (defined $commit_text) {
-               @commit_lines = @$commit_text;
-       } else {
-               local $/ = "\0";
-               open my $fd, "-|", git_cmd(), "rev-list",
-                       "--header", "--parents", "--max-count=1",
-                       $commit_id, "--"
-                       or return;
-               @commit_lines = split '\n', <$fd>;
-               close $fd or return;
-               pop @commit_lines;
-       }
+       pop @commit_lines; # Remove '\0'
+
        my $header = shift @commit_lines;
        if (!($header =~ m/^[0-9a-fA-F]{40}/)) {
                return;
@@ -1375,6 +1363,75 @@ sub parse_commit {
        return %co;
 }
 
+sub parse_commit {
+       my ($commit_id) = @_;
+       my %co;
+
+       local $/ = "\0";
+
+       open my $fd, "-|", git_cmd(), "rev-list",
+               "--header",
+               "--parents",
+               "--max-count=1",
+               $commit_id,
+               "--",
+               or die_error(undef, "Open git-rev-list failed");
+       %co = parse_commit_text(<$fd>);
+       close $fd;
+
+       return %co;
+}
+
+sub parse_commits {
+       my ($commit_id, $maxcount, $skip, $arg, $filename) = @_;
+       my @cos;
+
+       $maxcount ||= 1;
+       $skip ||= 0;
+
+       # Delete once rev-list supports the --skip option
+       if ($skip > 0) {
+               open my $fd, "-|", git_cmd(), "rev-list",
+                       ($arg ? ($arg) : ()),
+                       ("--max-count=" . ($maxcount + $skip)),
+                       $commit_id,
+                       "--",
+                       ($filename ? ($filename) : ())
+                       or die_error(undef, "Open git-rev-list failed");
+               while (my $line = <$fd>) {
+                       if ($skip-- <= 0) {
+                               chomp $line;
+                               my %co = parse_commit($line);
+                               push @cos, \%co;
+                       }
+               }
+               close $fd;
+
+               return wantarray ? @cos : \@cos;
+       }
+
+       local $/ = "\0";
+
+       open my $fd, "-|", git_cmd(), "rev-list",
+               "--header",
+               "--parents",
+               ($arg ? ($arg) : ()),
+               ("--max-count=" . $maxcount),
+               # Add once rev-list supports the --skip option
+               # ("--skip=" . $skip),
+               $commit_id,
+               "--",
+               ($filename ? ($filename) : ())
+               or die_error(undef, "Open git-rev-list failed");
+       while (my $line = <$fd>) {
+               my %co = parse_commit_text($line);
+               push @cos, \%co;
+       }
+       close $fd;
+
+       return wantarray ? @cos : \@cos;
+}
+
 # parse ref from ref_file, given by ref_id, with given type
 sub parse_ref {
        my $ref_file = shift;