gitweb: Change atom, rss actions to use parse_commits.

diff --git a/revision.c b/revision.c
index 56819f8220b379575fd0e68d970acbffd9ed0249..e7eccd9180f855f7ff0df5c4515a6d98288fd127 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -6,7 +6,6 @@
 #include "diff.h"
 #include "refs.h"
 #include "revision.h"
-#include <regex.h>
 #include "grep.h"
 
 static char *path_name(struct name_path *path, const char *name)
@@ -527,6 +526,7 @@ void init_revisions(struct rev_info *revs, const char *prefix)
        revs->prefix = prefix;
        revs->max_age = -1;
        revs->min_age = -1;
+       revs->skip_count = -1;
        revs->max_count = -1;
 
        revs->prune_fn = NULL;
@@ -763,6 +763,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                revs->max_count = atoi(arg + 12);
                                continue;
                        }
+                       if (!strncmp(arg, "--skip=", 7)) {
+                               revs->skip_count = atoi(arg + 7);
+                               continue;
+                       }
                        /* accept -<digit>, like traditional "head" */
                        if ((*arg == '-') && isdigit(arg[1])) {
                                revs->max_count = atoi(arg + 1);
@@ -853,8 +857,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                revs->boundary = 1;
                                continue;
                        }
-                       if (!strcmp(arg, "--no-left-right")) {
-                               revs->no_left_right = 1;
+                       if (!strcmp(arg, "--left-right")) {
+                               revs->left_right = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--objects")) {
@@ -1055,18 +1059,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 void prepare_revision_walk(struct rev_info *revs)
 {
        int nr = revs->pending.nr;
-       int has_symmetric = 0;
        struct object_array_entry *list = revs->pending.objects;
 
        revs->pending.nr = 0;
        revs->pending.alloc = 0;
        revs->pending.objects = NULL;
        while (--nr >= 0) {
-               struct commit *commit;
-
-               if (list->item->flags & SYMMETRIC_LEFT)
-                       has_symmetric = 1;
-               commit = handle_commit(revs, list->item, list->name);
+               struct commit *commit = handle_commit(revs, list->item, list->name);
                if (commit) {
                        if (!(commit->object.flags & SEEN)) {
                                commit->object.flags |= SEEN;
@@ -1078,8 +1077,6 @@ void prepare_revision_walk(struct rev_info *revs)
 
        if (revs->no_walk)
                return;
-       if (!revs->no_left_right && has_symmetric)
-               revs->left_right = 1;
        if (revs->limited)
                limit_list(revs);
        if (revs->topo_order)
@@ -1137,23 +1134,11 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
                           commit->buffer, strlen(commit->buffer));
 }
 
-struct commit *get_revision(struct rev_info *revs)
+static struct commit *get_revision_1(struct rev_info *revs)
 {
-       struct commit_list *list = revs->commits;
-
-       if (!list)
+       if (!revs->commits)
                return NULL;
 
-       /* Check the max_count ... */
-       switch (revs->max_count) {
-       case -1:
-               break;
-       case 0:
-               return NULL;
-       default:
-               revs->max_count--;
-       }
-
        do {
                struct commit_list *entry = revs->commits;
                struct commit *commit = entry->item;
@@ -1220,3 +1205,28 @@ struct commit *get_revision(struct rev_info *revs)
        } while (revs->commits);
        return NULL;
 }
+
+struct commit *get_revision(struct rev_info *revs)
+{
+       struct commit *c = NULL;
+
+       if (0 < revs->skip_count) {
+               while ((c = get_revision_1(revs)) != NULL) {
+                       if (revs->skip_count-- <= 0)
+                               break;
+               }
+       }
+
+       /* Check the max_count ... */
+       switch (revs->max_count) {
+       case -1:
+               break;
+       case 0:
+               return NULL;
+       default:
+               revs->max_count--;
+       }
+       if (c)
+               return c;
+       return get_revision_1(revs);
+}