Commit a6bf1687 by Carlos Martín Nieto

tree: allow the user to skip an entry or cancel the walk

Returning a negative cancels the walk, and returning a positive one
causes us to skip an entry, which was previously done by a negative
value.

This allows us to stay consistent with the rest of the functions that
take a callback and keeps the skipping functionality.
parent 53ae1235
...@@ -351,8 +351,9 @@ enum git_treewalk_mode { ...@@ -351,8 +351,9 @@ enum git_treewalk_mode {
* the current (relative) root for the entry and the entry * the current (relative) root for the entry and the entry
* data itself. * data itself.
* *
* If the callback returns a negative value, the passed entry * If the callback returns a positive value, the passed entry will be
* will be skipped on the traversal. * skipped on the traversal (in pre mode). A negative value stops the
* walk.
* *
* @param tree The tree to walk * @param tree The tree to walk
* @param callback Function to call on each tree entry * @param callback Function to call on each tree entry
......
...@@ -787,8 +787,13 @@ static int tree_walk( ...@@ -787,8 +787,13 @@ static int tree_walk(
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 (preorder && callback(path->ptr, entry, payload) < 0) if (preorder) {
continue error = callback(path->ptr, entry, payload);
if (error > 0)
continue;
if (error < 0)
return GIT_EUSER;
}
if (git_tree_entry__is_tree(entry)) { if (git_tree_entry__is_tree(entry)) {
git_tree *subtree; git_tree *subtree;
...@@ -813,7 +818,7 @@ static int tree_walk( ...@@ -813,7 +818,7 @@ static int tree_walk(
git_tree_free(subtree); git_tree_free(subtree);
} }
if (!preorder && callback(path->ptr, entry, payload)) { if (!preorder && callback(path->ptr, entry, payload) < 0) {
error = GIT_EUSER; error = GIT_EUSER;
break; break;
} }
......
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