revision: --skip=<n>
This adds --skip=<n> option to revision traversal machinery. Documentation and test were added by Robert Fitzsimons. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Dec 19, 2006 at 18:25 UTC
d5db6c9ee79cfa1794d75847b8376430f08b203f
4 files changed
+89
-14
Documentation/git-rev-list.txt
+5
@@ -10,6 +10,7 @@ SYNOPSIS
10
--------
11
[verse]
12
'git-rev-list' [ \--max-count=number ]
13
+ [ \--skip=number ]
14
[ \--max-age=timestamp ]
15
[ \--min-age=timestamp ]
16
[ \--sparse ]
@@ -139,6 +140,10 @@ limiting may be applied.
140
141
Limit the number of commits output.
142
143
+--skip='number'::
144
+
145
+ Skip 'number' commits before starting to show the commit output.
146
+
147
--since='date', --after='date'::
148
149
Show commits more recent than a specific date.
revision.c
+32
-14
@@ -523,6 +523,7 @@ void init_revisions(struct rev_info *revs, const char *prefix)
523
revs->prefix = prefix;
524
revs->max_age = -1;
525
revs->min_age = -1;
526
+ revs->skip_count = -1;
527
revs->max_count = -1;
528
529
revs->prune_fn = NULL;
@@ -759,6 +760,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
760
revs->max_count = atoi(arg + 12);
761
continue;
762
}
763
+ if (!strncmp(arg, "--skip=", 7)) {
764
+ revs->skip_count = atoi(arg + 7);
765
+ continue;
766
+ }
767
/* accept -<digit>, like traditional "head" */
768
if ((*arg == '-') && isdigit(arg[1])) {
769
revs->max_count = atoi(arg + 1);
@@ -1122,23 +1127,11 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
1127
commit->buffer, strlen(commit->buffer));
1128
}
1129
1125
-struct commit *get_revision(struct rev_info *revs)
1130
+static struct commit *get_revision_1(struct rev_info *revs)
1131
{
1127
- struct commit_list *list = revs->commits;
1128
-
1129
- if (!list)
1132
+ if (!revs->commits)
1133
return NULL;
1134
1132
- /* Check the max_count ... */
1133
- switch (revs->max_count) {
1134
- case -1:
1135
- break;
1136
- case 0:
1137
- return NULL;
1138
- default:
1139
- revs->max_count--;
1140
- }
1141
-
1135
do {
1136
struct commit_list *entry = revs->commits;
1137
struct commit *commit = entry->item;
@@ -1205,3 +1198,28 @@ struct commit *get_revision(struct rev_info *revs)
1198
} while (revs->commits);
1199
return NULL;
1200
}
1201
+
1202
+struct commit *get_revision(struct rev_info *revs)
1203
+{
1204
+ struct commit *c = NULL;
1205
+
1206
+ if (0 < revs->skip_count) {
1207
+ while ((c = get_revision_1(revs)) != NULL) {
1208
+ if (revs->skip_count-- <= 0)
1209
+ break;
1210
+ }
1211
+ }
1212
+
1213
+ /* Check the max_count ... */
1214
+ switch (revs->max_count) {
1215
+ case -1:
1216
+ break;
1217
+ case 0:
1218
+ return NULL;
1219
+ default:
1220
+ revs->max_count--;
1221
+ }
1222
+ if (c)
1223
+ return c;
1224
+ return get_revision_1(revs);
1225
+}
revision.h
+1
@@ -75,6 +75,7 @@ struct rev_info {
75
struct grep_opt *grep_filter;
76
77
/* special limits */
78
+ int skip_count;
79
int max_count;
80
unsigned long max_age;
81
unsigned long min_age;
t/t6005-rev-list-count.sh
new
+51
@@ -0,0 +1,51 @@
1
+#!/bin/sh
2
+
3
+test_description='git-rev-list --max-count and --skip test'
4
+
5
+. ./test-lib.sh
6
+
7
+test_expect_success 'setup' '
8
+ for n in 1 2 3 4 5 ; do \
9
+ echo $n > a ; \
10
+ git add a ; \
11
+ git commit -m "$n" ; \
12
+ done
13
+'
14
+
15
+test_expect_success 'no options' '
16
+ test $(git-rev-list HEAD | wc -l) = 5
17
+'
18
+
19
+test_expect_success '--max-count' '
20
+ test $(git-rev-list HEAD --max-count=0 | wc -l) = 0 &&
21
+ test $(git-rev-list HEAD --max-count=3 | wc -l) = 3 &&
22
+ test $(git-rev-list HEAD --max-count=5 | wc -l) = 5 &&
23
+ test $(git-rev-list HEAD --max-count=10 | wc -l) = 5
24
+'
25
+
26
+test_expect_success '--max-count all forms' '
27
+ test $(git-rev-list HEAD --max-count=1 | wc -l) = 1 &&
28
+ test $(git-rev-list HEAD -1 | wc -l) = 1 &&
29
+ test $(git-rev-list HEAD -n1 | wc -l) = 1 &&
30
+ test $(git-rev-list HEAD -n 1 | wc -l) = 1
31
+'
32
+
33
+test_expect_success '--skip' '
34
+ test $(git-rev-list HEAD --skip=0 | wc -l) = 5 &&
35
+ test $(git-rev-list HEAD --skip=3 | wc -l) = 2 &&
36
+ test $(git-rev-list HEAD --skip=5 | wc -l) = 0 &&
37
+ test $(git-rev-list HEAD --skip=10 | wc -l) = 0
38
+'
39
+
40
+test_expect_success '--skip --max-count' '
41
+ test $(git-rev-list HEAD --skip=0 --max-count=0 | wc -l) = 0 &&
42
+ test $(git-rev-list HEAD --skip=0 --max-count=10 | wc -l) = 5 &&
43
+ test $(git-rev-list HEAD --skip=3 --max-count=0 | wc -l) = 0 &&
44
+ test $(git-rev-list HEAD --skip=3 --max-count=1 | wc -l) = 1 &&
45
+ test $(git-rev-list HEAD --skip=3 --max-count=2 | wc -l) = 2 &&
46
+ test $(git-rev-list HEAD --skip=3 --max-count=10 | wc -l) = 2 &&
47
+ test $(git-rev-list HEAD --skip=5 --max-count=10 | wc -l) = 0 &&
48
+ test $(git-rev-list HEAD --skip=10 --max-count=10 | wc -l) = 0
49
+'
50
+
51
+test_done