From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: Nicolas Pitre <nico@fluxnic.net>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 9/9] list-object.c: take "advantage" of new pv4_tree_desc interface
Date: Wed, 9 Oct 2013 21:46:16 +0700 [thread overview]
Message-ID: <1381329976-32082-10-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1381329976-32082-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
list-objects.c | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/list-objects.c b/list-objects.c
index 6def897..39ad3e6 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -7,6 +7,7 @@
#include "tree-walk.h"
#include "revision.h"
#include "list-objects.h"
+#include "packv4-parse.h"
static void process_blob(struct rev_info *revs,
struct blob *blob,
@@ -60,6 +61,7 @@ static void process_gitlink(struct rev_info *revs,
}
static void process_tree(struct rev_info *revs,
+ struct pv4_tree_desc *desc,
struct tree *tree,
show_tree_entry_fn show_tree_entry,
show_object_fn show,
@@ -69,8 +71,6 @@ static void process_tree(struct rev_info *revs,
void *cb_data)
{
struct object *obj = &tree->object;
- struct tree_desc desc;
- struct name_entry entry;
struct name_path me;
enum interesting match = revs->diffopt.pathspec.nr == 0 ?
all_entries_interesting: entry_not_interesting;
@@ -96,11 +96,10 @@ static void process_tree(struct rev_info *revs,
strbuf_addch(base, '/');
}
- init_tree_desc(&desc, tree->buffer, tree->size);
-
- while (tree_entry(&desc, &entry)) {
+ while (pv4_tree_entry(desc)) {
+ struct name_entry *entry = &desc->v2.entry;
if (match != all_entries_interesting) {
- match = tree_entry_interesting(&entry, base, 0,
+ match = tree_entry_interesting(entry, base, 0,
&revs->diffopt.pathspec);
if (match == all_entries_not_interesting)
break;
@@ -109,22 +108,26 @@ static void process_tree(struct rev_info *revs,
}
if (show_tree_entry)
- show_tree_entry(&entry, cb_data);
+ show_tree_entry(entry, cb_data);
- if (S_ISDIR(entry.mode))
+ if (S_ISDIR(entry->mode)) {
+ struct pv4_tree_desc sub_desc;
+ pv4_tree_desc_from_entry(&sub_desc, desc, 0);
process_tree(revs,
- lookup_tree(entry.sha1),
+ &sub_desc,
+ pv4_lookup_tree(desc),
show_tree_entry,
- show, &me, base, entry.path,
+ show, &me, base, entry->path,
cb_data);
- else if (S_ISGITLINK(entry.mode))
- process_gitlink(revs, entry.sha1,
- show, &me, entry.path,
+ pv4_release_tree_desc(&sub_desc);
+ } else if (S_ISGITLINK(entry->mode))
+ process_gitlink(revs, entry->sha1,
+ show, &me, entry->path,
cb_data);
else
process_blob(revs,
- lookup_blob(entry.sha1),
- show, &me, entry.path,
+ pv4_lookup_blob(desc),
+ show, &me, entry->path,
cb_data);
}
strbuf_setlen(base, baselen);
@@ -202,9 +205,12 @@ void traverse_commit_list(struct rev_info *revs,
continue;
}
if (obj->type == OBJ_TREE) {
- process_tree(revs, (struct tree *)obj,
+ struct pv4_tree_desc desc;
+ pv4_tree_desc_from_sha1(&desc, obj->sha1, 0);
+ process_tree(revs, &desc, (struct tree *)obj,
show_tree_entry, show_object,
NULL, &base, name, data);
+ pv4_release_tree_desc(&desc);
continue;
}
if (obj->type == OBJ_BLOB) {
--
1.8.2.83.gc99314b
next prev parent reply other threads:[~2013-10-09 14:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 14:46 [BAD PATCH 0/9] v4-aware tree walker API Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 1/9] sha1_file: provide real packed type in object_info_extended Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 2/9] pack v4: move v2 tree entry generation code out of decode_entries Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 3/9] pv4_tree_desc: introduce new struct for pack v4 tree walker Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 4/9] pv4_tree_desc: use struct tree_desc from pv4_tree_desc Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 5/9] pv4_tree_desc: allow decode_entries to return v4 trees, one at a time Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 6/9] pv4_tree_desc: complete interface Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 7/9] pv4_tree_desc: don't bother looking for v4 trees if no v4 packs are present Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` [PATCH 8/9] pv4_tree_desc: avoid lookup_object() when possible Nguyễn Thái Ngọc Duy
2013-10-09 14:46 ` Nguyễn Thái Ngọc Duy [this message]
2013-10-09 16:51 ` [BAD PATCH 0/9] v4-aware tree walker API Nicolas Pitre
2013-10-11 12:22 ` Duy Nguyen
2013-10-11 13:05 ` Duy Nguyen
2013-10-12 14:42 ` Nicolas Pitre
2013-10-12 15:59 ` Duy Nguyen
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=1381329976-32082-10-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=nico@fluxnic.net \
/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).