Re: [PATCH] rev-list: Add a new option --skip.
From: Junio C Hamano <hidden>
Date: 2016-08-11 19:55:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-08-11 · [PATCH] rev-list: Add a new option --skip. · Robert Fitzsimons <hidden>
Robert Fitzsimons [off-list ref] writes:
quoted hunk
diff --git a/builtin-rev-list.c b/builtin-rev-list.c index fb7fc92..432f901 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c@@ -246,6 +248,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) read_revisions_from_stdin(&revs); continue; } + if (!strncmp(arg, "--skip=", 7)) { + skip = atoi(arg + 7); + continue; + } usage(rev_list_usage); }
Hmph.... I am having a hard time convincing myself that this is a feature that is a narrow special case for rev-list and does not belong to the generic revision traversal machinery. That is, would people expect that 'log' family allow the to say: $ git log --skip=10 -4 master Declaring this as a special case for rev-list is certainly safer (no risk to harm the revision machinery which is quite central part of git), but if you define and initialize the new field next to max_count, it makes me feel that it should somehow be handled at the same layer. In other words,... --- revision.c | 46 ++++++++++++++++++++++++++++++++-------------- revision.h | 1 + 2 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/revision.c b/revision.c
index 993bb66..aa63d10 100644
--- a/revision.c
+++ b/revision.c@@ -524,6 +524,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;
@@ -760,6 +761,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);
@@ -1123,23 +1128,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;
@@ -1206,3 +1199,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); +}
diff --git a/revision.h b/revision.h
index 3adab95..81f522c 100644
--- a/revision.h
+++ b/revision.h@@ -75,6 +75,7 @@ struct rev_info { struct grep_opt *grep_filter; /* special limits */ + int skip_count; int max_count; unsigned long max_age; unsigned long min_age;