From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com
Cc: git@vger.kernel.org
Subject: [PATCH 1/3] list-objects.c: factor out traverse_trees_and_blobs
Date: Fri, 27 Oct 2017 17:45:04 -0700 [thread overview]
Message-ID: <20171028004506.10253-1-sbeller@google.com> (raw)
In-Reply-To: <20171028004419.10139-1-sbeller@google.com>
With traverse_trees_and_blobs factored out of the main traverse function,
the next patch can introduce an in-order revision walking with ease.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
list-objects.c | 46 ++++++++++++++++++++++++++++------------------
1 file changed, 28 insertions(+), 18 deletions(-)
diff --git a/list-objects.c b/list-objects.c
index b3931fa434..0ee0551604 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -183,25 +183,13 @@ static void add_pending_tree(struct rev_info *revs, struct tree *tree)
add_pending_object(revs, &tree->object, "");
}
-void traverse_commit_list(struct rev_info *revs,
- show_commit_fn show_commit,
- show_object_fn show_object,
- void *data)
+static void traverse_trees_and_blobs(struct rev_info *revs,
+ struct strbuf *base,
+ show_object_fn show_object,
+ void *data)
{
int i;
- struct commit *commit;
- struct strbuf base;
- strbuf_init(&base, PATH_MAX);
- while ((commit = get_revision(revs)) != NULL) {
- /*
- * an uninteresting boundary commit may not have its tree
- * parsed yet, but we are not going to show them anyway
- */
- if (commit->tree)
- add_pending_tree(revs, commit->tree);
- show_commit(commit, data);
- }
for (i = 0; i < revs->pending.nr; i++) {
struct object_array_entry *pending = revs->pending.objects + i;
struct object *obj = pending->item;
@@ -218,17 +206,39 @@ void traverse_commit_list(struct rev_info *revs,
path = "";
if (obj->type == OBJ_TREE) {
process_tree(revs, (struct tree *)obj, show_object,
- &base, path, data);
+ base, path, data);
continue;
}
if (obj->type == OBJ_BLOB) {
process_blob(revs, (struct blob *)obj, show_object,
- &base, path, data);
+ base, path, data);
continue;
}
die("unknown pending object %s (%s)",
oid_to_hex(&obj->oid), name);
}
object_array_clear(&revs->pending);
+}
+
+void traverse_commit_list(struct rev_info *revs,
+ show_commit_fn show_commit,
+ show_object_fn show_object,
+ void *data)
+{
+ struct commit *commit;
+ struct strbuf base;
+ strbuf_init(&base, PATH_MAX);
+
+ while ((commit = get_revision(revs)) != NULL) {
+ /*
+ * an uninteresting boundary commit may not have its tree
+ * parsed yet, but we are not going to show them anyway
+ */
+ if (commit->tree)
+ add_pending_tree(revs, commit->tree);
+ show_commit(commit, data);
+ }
+ traverse_trees_and_blobs(revs, &base, show_object, data);
+
strbuf_release(&base);
}
--
2.15.0.rc2.443.gfcc3b81c0a
next prev parent reply other threads:[~2017-10-28 0:45 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-28 0:44 [RFC PATCH 0/3] git-describe <blob> ? Stefan Beller
2017-10-28 0:45 ` Stefan Beller [this message]
2017-10-28 0:45 ` [PATCH 2/3] revision.h: introduce blob/tree walking in order of the commits Stefan Beller
2017-10-28 17:20 ` Johannes Schindelin
2017-10-29 3:22 ` Stefan Beller
2017-10-29 3:23 ` Stefan Beller
2017-10-29 3:43 ` Junio C Hamano
2017-10-28 0:45 ` [PATCH 3/3] builtin/describe: describe blobs Stefan Beller
2017-10-28 17:32 ` Johannes Schindelin
2017-10-28 22:47 ` Jacob Keller
2017-10-29 3:28 ` Stefan Beller
2017-10-29 12:02 ` Kevin Daudt
2017-10-29 12:07 ` Johannes Schindelin
2017-10-28 17:15 ` [PATCH 1/3] list-objects.c: factor out traverse_trees_and_blobs Johannes Schindelin
2017-10-29 3:13 ` Stefan Beller
2017-10-28 16:04 ` [RFC PATCH 0/3] git-describe <blob> ? Johannes Schindelin
2017-10-31 0:33 ` [PATCH 0/7] git-describe <blob> Stefan Beller
2017-10-31 0:33 ` [PATCH 1/7] list-objects.c: factor out traverse_trees_and_blobs Stefan Beller
2017-10-31 6:07 ` Junio C Hamano
2017-10-31 0:33 ` [PATCH 2/7] revision.h: introduce blob/tree walking in order of the commits Stefan Beller
2017-10-31 6:57 ` Junio C Hamano
2017-10-31 18:12 ` Stefan Beller
2017-10-31 0:33 ` [PATCH 3/7] builtin/describe.c: rename `oid` to avoid variable shadowing Stefan Beller
2017-10-31 8:15 ` Jacob Keller
2017-10-31 0:33 ` [PATCH 4/7] builtin/describe.c: print debug statements earlier Stefan Beller
2017-10-31 7:03 ` Junio C Hamano
2017-10-31 19:05 ` Stefan Beller
2017-10-31 0:33 ` [PATCH 5/7] builtin/describe.c: factor out describe_commit Stefan Beller
2017-10-31 0:33 ` [PATCH 6/7] builtin/describe.c: describe a blob Stefan Beller
2017-10-31 6:25 ` Junio C Hamano
2017-10-31 19:16 ` Stefan Beller
2017-11-01 3:34 ` Junio C Hamano
2017-11-01 20:58 ` Stefan Beller
2017-11-02 1:53 ` Junio C Hamano
2017-11-02 4:23 ` Junio C Hamano
2017-11-04 21:15 ` Philip Oakley
2017-11-05 6:28 ` Junio C Hamano
2017-11-06 23:50 ` Philip Oakley
2017-11-09 20:30 ` Stefan Beller
2017-11-10 0:25 ` Philip Oakley
2017-11-10 1:24 ` Junio C Hamano
2017-11-10 22:44 ` [PATCH 0/1] describe a blob: with better docs Stefan Beller
2017-11-10 22:44 ` [PATCH] builtin/describe.c: describe a blob Stefan Beller
2017-11-13 1:33 ` Junio C Hamano
2017-11-14 23:37 ` Stefan Beller
2017-11-20 15:22 ` [PATCH 6/7] " Philip Oakley
2017-11-20 18:18 ` Philip Oakley
2017-11-01 3:44 ` Junio C Hamano
2017-10-31 0:33 ` [PATCH 7/7] t6120: fix typo in test name Stefan Beller
2017-11-01 1:21 ` Junio C Hamano
2017-11-01 18:13 ` Stefan Beller
2017-11-02 1:36 ` Junio C Hamano
2017-10-31 21:18 ` [PATCHv2 0/7] git describe blob Stefan Beller
2017-10-31 21:18 ` [PATCHv2 1/7] list-objects.c: factor out traverse_trees_and_blobs Stefan Beller
2017-11-01 3:46 ` Junio C Hamano
2017-10-31 21:18 ` [PATCHv2 2/7] revision.h: introduce blob/tree walking in order of the commits Stefan Beller
2017-11-01 3:50 ` Junio C Hamano
2017-11-01 12:26 ` Johannes Schindelin
2017-11-01 12:37 ` Junio C Hamano
2017-11-01 19:37 ` Stefan Beller
2017-11-01 22:08 ` Johannes Schindelin
2017-11-01 22:19 ` Stefan Beller
2017-11-01 22:39 ` Johannes Schindelin
2017-11-01 22:46 ` Stefan Beller
2017-11-01 21:36 ` Johannes Schindelin
2017-11-01 21:39 ` Jeff King
2017-11-01 22:33 ` Johannes Schindelin
2017-11-02 1:20 ` Junio C Hamano
2017-10-31 21:18 ` [PATCHv2 3/7] builtin/describe.c: rename `oid` to avoid variable shadowing Stefan Beller
2017-10-31 21:18 ` [PATCHv2 4/7] builtin/describe.c: print debug statements earlier Stefan Beller
2017-10-31 21:31 ` Eric Sunshine
2017-10-31 21:18 ` [PATCHv2 5/7] builtin/describe.c: factor out describe_commit Stefan Beller
2017-10-31 21:18 ` [PATCHv2 6/7] builtin/describe.c: describe a blob Stefan Beller
2017-10-31 21:49 ` Eric Sunshine
2017-11-01 19:51 ` Stefan Beller
2017-11-01 4:11 ` Junio C Hamano
2017-11-01 12:32 ` Johannes Schindelin
2017-11-01 17:59 ` Stefan Beller
2017-11-01 21:05 ` Jacob Keller
2017-11-01 22:12 ` Johannes Schindelin
2017-11-01 22:21 ` Stefan Beller
2017-11-01 22:41 ` Johannes Schindelin
2017-11-01 22:53 ` Stefan Beller
2017-11-02 6:05 ` Jacob Keller
2017-11-03 5:18 ` Junio C Hamano
2017-11-03 6:55 ` Jacob Keller
2017-11-03 15:02 ` Junio C Hamano
2017-11-02 7:23 ` Andreas Schwab
2017-11-02 18:18 ` Stefan Beller
2017-11-03 12:05 ` Johannes Schindelin
2017-11-01 21:28 ` Stefan Beller
2017-10-31 21:18 ` [PATCHv2 7/7] t6120: fix typo in test name Stefan Beller
2017-11-01 5:14 ` [PATCHv2 0/7] git describe blob Junio C Hamano
2017-11-02 19:41 ` [PATCHv3 " Stefan Beller
2017-11-02 19:41 ` [PATCHv3 1/7] t6120: fix typo in test name Stefan Beller
2017-11-02 19:41 ` [PATCHv3 2/7] list-objects.c: factor out traverse_trees_and_blobs Stefan Beller
2017-11-02 19:41 ` [PATCHv3 3/7] revision.h: introduce blob/tree walking in order of the commits Stefan Beller
2017-11-14 19:52 ` Jonathan Tan
2017-11-02 19:41 ` [PATCHv3 4/7] builtin/describe.c: rename `oid` to avoid variable shadowing Stefan Beller
2017-11-02 19:41 ` [PATCHv3 5/7] builtin/describe.c: print debug statements earlier Stefan Beller
2017-11-14 19:55 ` Jonathan Tan
2017-11-14 20:00 ` Stefan Beller
2017-11-02 19:41 ` [PATCHv3 6/7] builtin/describe.c: factor out describe_commit Stefan Beller
2017-11-02 19:41 ` [PATCHv3 7/7] builtin/describe.c: describe a blob Stefan Beller
2017-11-14 20:02 ` Jonathan Tan
2017-11-14 20:40 ` Stefan Beller
2017-11-14 21:17 ` Jonathan Tan
2017-11-03 0:23 ` [PATCHv3 0/7] git describe blob Jacob Keller
2017-11-03 1:46 ` Junio C Hamano
2017-11-03 2:29 ` Stefan Beller
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171028004506.10253-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).