diff options
author | Junio C Hamano <junkio@cox.net> | 2007-02-13 19:20:06 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 19:20:06 -0800 |
commit | c230390b4773b9e4469085283033da9e910e50a6 (patch) | |
tree | 97ccde4c5907c1d3a4435ea6b382523f415d8cbb | |
parent | Merge branch 'jc/diff-apply-patch' (diff) | |
parent | Teach revision machinery about --reverse (diff) | |
download | tgif-c230390b4773b9e4469085283033da9e910e50a6.tar.xz |
Merge branch 'js/reverse'
* js/reverse:
Teach revision machinery about --reverse
-rw-r--r-- | Documentation/git-rev-list.txt | 5 | ||||
-rw-r--r-- | revision.c | 38 | ||||
-rw-r--r-- | revision.h | 3 |
3 files changed, 45 insertions, 1 deletions
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index c742117595..4f145eaba4 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -27,6 +27,7 @@ SYNOPSIS [ \--pretty | \--header ] [ \--bisect ] [ \--merge ] + [ \--reverse ] [ \--walk-reflogs ] <commit>... [ \-- <paths>... ] @@ -266,6 +267,10 @@ By default, the commits are shown in reverse chronological order. parent comes before all of its children, but otherwise things are still ordered in the commit timestamp order. +--reverse:: + + Output the commits in reverse order. + Object Traversal ~~~~~~~~~~~~~~~~ diff --git a/revision.c b/revision.c index 15bdaf6095..5b1794b0ef 100644 --- a/revision.c +++ b/revision.c @@ -1058,6 +1058,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch git_log_output_encoding = ""; continue; } + if (!strcmp(arg, "--reverse")) { + revs->reverse ^= 1; + continue; + } opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i); if (opts > 0) { @@ -1286,6 +1290,40 @@ struct commit *get_revision(struct rev_info *revs) { struct commit *c = NULL; + if (revs->reverse) { + struct commit_list *list; + + /* + * rev_info.reverse is used to note the fact that we + * want to output the list of revisions in reverse + * order. To accomplish this goal, reverse can have + * different values: + * + * 0 do nothing + * 1 reverse the list + * 2 internal use: we have already obtained and + * reversed the list, now we only need to yield + * its items. + */ + + if (revs->reverse == 1) { + revs->reverse = 0; + list = NULL; + while ((c = get_revision(revs))) + commit_list_insert(c, &list); + revs->commits = list; + revs->reverse = 2; + } + + if (!revs->commits) + return NULL; + c = revs->commits->item; + list = revs->commits->next; + free(revs->commits); + revs->commits = list; + return c; + } + if (0 < revs->skip_count) { while ((c = get_revision_1(revs)) != NULL) { if (revs->skip_count-- <= 0) diff --git a/revision.h b/revision.h index d93481f68f..5fec1846f3 100644 --- a/revision.h +++ b/revision.h @@ -42,7 +42,8 @@ struct rev_info { unpacked:1, /* see also ignore_packed below */ boundary:1, left_right:1, - parents:1; + parents:1, + reverse:2; /* Diff flags */ unsigned int diff:1, |