Provide a demonstration of a revision walk which traverses all types of
object, not just commits. This type of revision walk is used for
operations such as creating packfiles and performing fetches or clones,
so it's useful to teach new developers how it works. For starters, only
demonstrate the unfiltered version, as this will make the tutorial
easier to follow.
This commit is part of a tutorial on revision walking.
Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
Change-Id: If3b11652ba011b28d29b1c3984dac4a3f80a5f53
---
builtin/walken.c | 88 +++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 79 insertions(+), 9 deletions(-)
diff --git a/builtin/walken.c b/builtin/walken.c
index 958923c172..42b23ba1ec 100644
--- a/builtin/walken.c
+++ b/builtin/walken.c
@@ -11,6 +11,7 @@
#include "parse-options.h"
#include "pretty.h"
#include "line-log.h"
+#include "list-objects.h"
#include "grep.h"
/*
@@ -22,6 +23,11 @@ const char * const walken_usage[] = {
NULL,
};
+static int commit_count;
+static int tag_count;
+static int blob_count;
+static int tree_count;
+
/*
* Within init_walken_defaults() we can call into other useful defaults to set
* in the global scope or on the_repository. It's okay to borrow from other
@@ -103,6 +109,65 @@ static int git_walken_config(const char *var, const char *value, void *cb)
return git_default_config(var, value, cb);
}
+static void walken_show_commit(struct commit *cmt, void *buf)
+{
+ commit_count++;
+}
+
+static void walken_show_object(struct object *obj, const char *str, void *buf)
+{
+ switch (obj->type) {
+ case OBJ_TREE:
+ tree_count++;
+ break;
+ case OBJ_BLOB:
+ blob_count++;
+ break;
+ case OBJ_TAG:
+ tag_count++;
+ break;
+ case OBJ_COMMIT:
+ die(_("unexpectedly encountered a commit in "
+ "walken_show_object\n"));
+ commit_count++;
+ break;
+ default:
+ die(_("unexpected object type %s\n"), type_name(obj->type));
+ break;
+ }
+}
+
+/*
+ * walken_object_walk() is invoked by cmd_walken() after initialization. It does
+ * a walk of all object types.
+ */
+static void walken_object_walk(struct rev_info *rev)
+{
+ rev->tree_objects = 1;
+ rev->blob_objects = 1;
+ rev->tag_objects = 1;
+ rev->tree_blobs_in_commit_order = 1;
+ rev->exclude_promisor_objects = 1;
+
+ if (prepare_revision_walk(rev))
+ die(_("revision walk setup failed"));
+
+ commit_count = 0;
+ tag_count = 0;
+ blob_count = 0;
+ tree_count = 0;
+
+ traverse_commit_list(rev, walken_show_commit, walken_show_object, NULL);
+
+ /*
+ * This print statement is designed to be script-parseable. Script
+ * authors will rely on the output not to change, so we will not
+ * localize this string. It will go to stdout directly.
+ */
+ printf("commits %d\n blobs %d\n tags %d\n trees %d\n", commit_count,
+ blob_count, tag_count, tree_count);
+}
+
/*
* walken_commit_walk() is invoked by cmd_walken() after initialization. It
* does the commit walk only.
@@ -113,15 +178,15 @@ static void walken_commit_walk(struct rev_info *rev)
struct strbuf prettybuf = STRBUF_INIT;
/*
- * prepare_revision_walk() gets the final steps ready for a revision
+ * prepare_revision_walk() gets the final steps ready for a revision
* walk. We check the return value for errors.
- */
+ */
if (prepare_revision_walk(rev)) {
die(_("revision walk setup failed"));
}
/*
- * Now we can start the real commit walk. get_revision grabs the next
+ * Now we can start the real commit walk. get_revision grabs the next
* revision based on the contents of rev.
*/
rev->diffopt.close_file = 0;
@@ -166,13 +231,18 @@ int cmd_walken(int argc, const char **argv, const char *prefix)
/* We can set our traversal flags here. */
rev.always_show_header = 1;
- /*
- * Before we do the walk, we need to set a starting point by giving it
- * something to go in `pending` - that happens in here
- */
- final_rev_info_setup(argc, argv, prefix, &rev);
- walken_commit_walk(&rev);
+ if (1) {
+ add_head_to_pending(&rev);
+ walken_object_walk(&rev);
+ } else {
+ /*
+ * Before we do the walk, we need to set a starting point by giving it
+ * something to go in `pending` - that happens in here
+ */
+ final_rev_info_setup(argc, argv, prefix, &rev);
+ walken_commit_walk(&rev);
+ }
/*
* This line is "human-readable" and we are writing a plumbing command,
--
2.22.0.410.gd8fdbe21b5-goog
