From: Lawrence Siebert <lawrencesiebert@gmail.com>
To: git@vger.kernel.org
Cc: remi.galan-alfonso@ensimag.grenoble-inp.fr, gitster@pobox.com,
Lawrence Siebert <lawrencesiebert@gmail.com>
Subject: [PATCH v2 2/4] log: add --count option to git log
Date: Thu, 2 Jul 2015 16:50:09 -0700 [thread overview]
Message-ID: <1435881011-13879-3-git-send-email-lawrencesiebert@gmail.com> (raw)
In-Reply-To: <1435881011-13879-1-git-send-email-lawrencesiebert@gmail.com>
adds --count from git rev-list to git log, without --use-bitmap-index
for the moment.
Signed-off-by: Lawrence Siebert <lawrencesiebert@gmail.com>
---
builtin/log.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/builtin/log.c b/builtin/log.c
index 8781049..4aaff3a 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -25,6 +25,7 @@
#include "version.h"
#include "mailmap.h"
#include "gpg-interface.h"
+#include "list-objects.h"
/* Set a default date-time format for git log ("log.date" config variable) */
static const char *default_date_mode = NULL;
@@ -317,12 +318,40 @@ static void finish_early_output(struct rev_info *rev)
show_early_header(rev, "done", n);
}
+static void show_object(struct object *obj,
+ const struct name_path *path, const char *component,
+ void *cb_data)
+{
+ return;
+}
+
+static void show_commit(struct commit *commit, void *data)
+{
+ struct rev_info *revs = (struct rev_info *)data;
+ if (commit->object.flags & PATCHSAME)
+ revs->count_same++;
+ else if (commit->object.flags & SYMMETRIC_LEFT)
+ revs->count_left++;
+ else
+ revs->count_right++;
+ if (commit->parents) {
+ free_commit_list(commit->parents);
+ commit->parents = NULL;
+ }
+ free_commit_buffer(commit);
+}
+
static int cmd_log_walk(struct rev_info *rev)
{
struct commit *commit;
int saved_nrl = 0;
int saved_dcctc = 0;
+ if (rev->count) {
+ prepare_revision_walk(rev);
+ traverse_commit_list(rev, show_commit, show_object, rev);
+ get_commit_count(rev);
+ }
if (rev->early_output)
setup_early_output(rev);
--
1.9.1
next prev parent reply other threads:[~2015-07-02 23:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 23:50 [PATCH v2 0/4] git log --count Lawrence Siebert
2015-07-02 23:50 ` [PATCH v2 1/4] list-object: add get_commit_count function Lawrence Siebert
2015-07-03 7:24 ` Matthieu Moy
2015-07-03 8:09 ` Lawrence Siebert
2015-07-03 8:59 ` Matthieu Moy
2015-07-02 23:50 ` Lawrence Siebert [this message]
2015-07-03 7:29 ` [PATCH v2 2/4] log: add --count option to git log Matthieu Moy
2015-07-03 8:05 ` Lawrence Siebert
2015-07-03 9:16 ` Matthieu Moy
2015-07-02 23:50 ` [PATCH v2 3/4] log --count: added test Lawrence Siebert
2015-07-03 7:34 ` Matthieu Moy
2015-07-03 8:30 ` Lawrence Siebert
2015-07-03 9:16 ` Matthieu Moy
2015-07-03 9:54 ` Matthieu Moy
2015-07-04 0:57 ` Junio C Hamano
2015-07-04 0:54 ` Junio C Hamano
2015-07-02 23:50 ` [PATCH v2 4/4] git-log: update man documentation for --count Lawrence Siebert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435881011-13879-3-git-send-email-lawrencesiebert@gmail.com \
--to=lawrencesiebert@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).