Commit c6f42953 by Michael Schubert

tree: fix ordering for git_tree_walk

Josh Triplett noticed libgit2 actually does preorder entries in
tree_walk_post instead of postorder. Also, we continued walking even
when an error occured in the callback.

Fix #773; also, allow both pre- and postorder walking.
parent 5a8204f8
...@@ -759,11 +759,12 @@ int git_tree_entry_bypath( ...@@ -759,11 +759,12 @@ int git_tree_entry_bypath(
return error; return error;
} }
static int tree_walk_post( static int tree_walk(
git_tree *tree, git_tree *tree,
git_treewalk_cb callback, git_treewalk_cb callback,
git_buf *path, git_buf *path,
void *payload) void *payload,
bool preorder)
{ {
int error = 0; int error = 0;
unsigned int i; unsigned int i;
...@@ -771,8 +772,8 @@ static int tree_walk_post( ...@@ -771,8 +772,8 @@ static int tree_walk_post(
for (i = 0; i < tree->entries.length; ++i) { for (i = 0; i < tree->entries.length; ++i) {
git_tree_entry *entry = tree->entries.contents[i]; git_tree_entry *entry = tree->entries.contents[i];
if (callback(path->ptr, entry, payload) < 0) if (preorder && callback(path->ptr, entry, payload) < 0)
continue; return -1;
if (git_tree_entry__is_tree(entry)) { if (git_tree_entry__is_tree(entry)) {
git_tree *subtree; git_tree *subtree;
...@@ -789,12 +790,15 @@ static int tree_walk_post( ...@@ -789,12 +790,15 @@ static int tree_walk_post(
if (git_buf_oom(path)) if (git_buf_oom(path))
return -1; return -1;
if (tree_walk_post(subtree, callback, path, payload) < 0) if (tree_walk(subtree, callback, path, payload, preorder) < 0)
return -1; return -1;
git_buf_truncate(path, path_len); git_buf_truncate(path, path_len);
git_tree_free(subtree); git_tree_free(subtree);
} }
if (!preorder && callback(path->ptr, entry, payload) < 0)
return -1;
} }
return 0; return 0;
...@@ -807,12 +811,12 @@ int git_tree_walk(git_tree *tree, git_treewalk_cb callback, int mode, void *payl ...@@ -807,12 +811,12 @@ int git_tree_walk(git_tree *tree, git_treewalk_cb callback, int mode, void *payl
switch (mode) { switch (mode) {
case GIT_TREEWALK_POST: case GIT_TREEWALK_POST:
error = tree_walk_post(tree, callback, &root_path, payload); error = tree_walk(tree, callback, &root_path, payload, false);
break; break;
case GIT_TREEWALK_PRE: case GIT_TREEWALK_PRE:
tree_error("Preorder tree walking is still not implemented"); error = tree_walk(tree, callback, &root_path, payload, true);
return -1; break;
default: default:
giterr_set(GITERR_INVALID, "Invalid walking mode for tree walk"); giterr_set(GITERR_INVALID, "Invalid walking mode for tree walk");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment