move printing of tree objects into regression test
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158
diff --git a/lib/object.c b/lib/object.c
index f4cdddb..ba716d0 100644
--- a/lib/object.c
+++ b/lib/object.c
@@ -474,9 +474,6 @@ parse_tree_entry(struct got_tree_entry **te, size_t *elen, char *buf,
buf += strlen(buf) + 1;
memcpy((*te)->id.sha1, buf, SHA1_DIGEST_LENGTH);
*elen += SHA1_DIGEST_LENGTH;
-
- printf("%s %s%s\n", got_object_id_str(&(*te)->id, hex, sizeof(hex)),
- (*te)->name, mode_trailer((*te)->mode));
done:
if (err)
tree_entry_close(*te);
@@ -484,30 +481,6 @@ done:
}
static const struct got_error *
-open_tree_recursive(struct got_object_id *id, struct got_repository *repo)
-{
- struct got_object *obj;
- struct got_tree_object *tree;
- const struct got_error *err;
-
- err = got_object_open(&obj, repo, id);
- if (err)
- return err;
- if (obj->type != GOT_OBJ_TYPE_TREE)
- return got_error(GOT_ERR_OBJ_TYPE);
-
- err = got_object_tree_open(&tree, repo, obj);
- if (err) {
- got_object_close(obj);
- return err;
- }
-
- got_object_tree_close(tree);
- got_object_close(obj);
- return NULL;
-}
-
-static const struct got_error *
parse_tree_object(struct got_tree_object **tree, struct got_repository *repo,
char *buf, size_t len)
{
@@ -527,18 +500,9 @@ parse_tree_object(struct got_tree_object **tree, struct got_repository *repo,
parse_tree_entry(&te, &elen, buf, remain);
(*tree)->nentries++;
SIMPLEQ_INSERT_TAIL(&(*tree)->entries, te, entry);
- if (S_ISDIR(te->mode)) {
- const struct got_error *err;
- err = open_tree_recursive(&te->id, repo);
- if (err) {
- got_object_tree_close(*tree);
- return err;
- }
- }
buf += elen;
remain -= elen;
}
- printf("\n");
if (remain != 0) {
got_object_tree_close(*tree);
@@ -688,4 +652,13 @@ got_object_tree_open(struct got_tree_object **tree,
void
got_object_tree_close(struct got_tree_object *tree)
{
+ struct got_tree_entry *te;
+
+ while (!SIMPLEQ_EMPTY(&tree->entries)) {
+ te = SIMPLEQ_FIRST(&tree->entries);
+ SIMPLEQ_REMOVE_HEAD(&tree->entries, entry);
+ tree_entry_close(te);
+ }
+
+ free(tree);
}
diff --git a/regress/repository/repository_test.c b/regress/repository/repository_test.c
index 2044938..d5a430d 100644
--- a/regress/repository/repository_test.c
+++ b/regress/repository/repository_test.c
@@ -56,17 +56,60 @@ print_parent_commits(struct got_commit_object *commit,
}
static const struct got_error *
-print_tree_object(struct got_object *obj, struct got_repository *repo)
+print_tree_object(struct got_object *obj, char *parent,
+ struct got_repository *repo)
{
struct got_tree_object *tree;
+ struct got_tree_entry *te;
const struct got_error *err;
+ char hex[SHA1_DIGEST_STRING_LENGTH];
err = got_object_tree_open(&tree, repo, obj);
if (err != NULL)
return err;
+ SIMPLEQ_FOREACH(te, &tree->entries, entry) {
+ struct got_object *treeobj;
+ char *next_parent;
+
+ if (!S_ISDIR(te->mode)) {
+ printf("%s %s/%s\n",
+ got_object_id_str(&te->id, hex, sizeof(hex)),
+ parent, te->name);
+ continue;
+ }
+ printf("%s %s/%s\n",
+ got_object_id_str(&te->id, hex, sizeof(hex)),
+ parent, te->name);
+
+ err = got_object_open(&treeobj, repo, &te->id);
+ if (err != NULL)
+ break;
+
+ if (treeobj->type != GOT_OBJ_TYPE_TREE) {
+ err = got_error(GOT_ERR_OBJ_TYPE);
+ got_object_close(treeobj);
+ break;
+ }
+
+ if (asprintf(&next_parent, "%s/%s", parent, te->name) == -1) {
+ err = got_error(GOT_ERR_NO_MEM);
+ got_object_close(treeobj);
+ break;
+ }
+
+ err = print_tree_object(treeobj, next_parent, repo);
+ free(next_parent);
+ if (err) {
+ got_object_close(treeobj);
+ break;
+ }
+
+ got_object_close(treeobj);
+ }
+
got_object_tree_close(tree);
- return NULL;
+ return err;
}
static const struct got_error *
@@ -96,8 +139,10 @@ print_commit_object(struct got_object *obj, struct got_repository *repo)
err = got_object_open(&treeobj, repo, &commit->tree_id);
if (err != NULL)
return err;
- if (treeobj->type == GOT_OBJ_TYPE_TREE)
- print_tree_object(treeobj, repo);
+ if (treeobj->type == GOT_OBJ_TYPE_TREE) {
+ print_tree_object(treeobj, "", repo);
+ printf("\n");
+ }
got_object_close(treeobj);
err = print_parent_commits(commit, repo);