[GSoC][PATCH 2/4] rev-parse: use strbuf_add_path for path formatting
- From
K Jayatheerth <jayatheerthkulkarni2005@gmail.com>
- Date
- Jun 1, 2026, 15:19 UTC
- Message-ID
- <20260601151950.30686-3-jayatheerthkulkarni2005@gmail.com>
- In-Reply-To
- <20260601151950.30686-1-jayatheerthkulkarni2005@gmail.com>
Now that the core path-formatting logic has been abstracted into strbuf_add_path() inside path.c, remove the duplicate localized implementation from builtin/rev-parse.c.
Drop the local format_type and default_type enums from the builtin, and update print_path() to act as a light wrapper around the new shared strbuf engine. Update cmd_rev_parse() to use the new path_ format and default enum types exposed via path.h.
Signed-off-by: K Jayatheerth <jayatheerthkulkarni2005@gmail.com> Mentored-by: Justin Tobler <jltobler@gmail.com> Mentored-by: Lucas Seiki Oshiro <lucasseikioshiro@gmail.com> --- builtin/rev-parse.c | 100 ++++++++++---------------------------------- 1 file changed, 21 insertions(+), 79 deletions(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 218b5f34d6..812cfd55ad 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -632,73 +632,15 @@ static void handle_ref_opt(const char *pattern, const char *prefix) clear_ref_exclusions(&ref_excludes); } -enum format_type { - /* We would like a relative path. */ - FORMAT_RELATIVE, - /* We would like a canonical absolute path. */ - FORMAT_CANONICAL, - /* We would like the default behavior. */ - FORMAT_DEFAULT, -}; - -enum default_type { - /* Our default is a relative path. */ - DEFAULT_RELATIVE, - /* Our default is a relative path if there's a shared root. */ - DEFAULT_RELATIVE_IF_SHARED, - /* Our default is a canonical absolute path. */ - DEFAULT_CANONICAL, - /* Our default is not to modify the item. */ - DEFAULT_UNMODIFIED, -}; - -static void print_path(const char *path, const char *prefix, enum format_type format, enum default_type def) +static void print_path(const char *path, const char *prefix, + enum path_format_type format, enum path_default_type def) { - char *cwd = NULL; - /* - * We don't ever produce a relative path if prefix is NULL, so set the - * prefix to the current directory so that we can produce a relative - * path whenever possible. If we're using RELATIVE_IF_SHARED mode, then - * we want an absolute path unless the two share a common prefix, so don't - * set it in that case, since doing so causes a relative path to always - * be produced if possible. - */ - if (!prefix && (format != FORMAT_DEFAULT || def != DEFAULT_RELATIVE_IF_SHARED)) - prefix = cwd = xgetcwd(); - if (format == FORMAT_DEFAULT && def == DEFAULT_UNMODIFIED) { - puts(path); - } else if (format == FORMAT_RELATIVE || - (format == FORMAT_DEFAULT && def == DEFAULT_RELATIVE)) { - /* - * In order for relative_path to work as expected, we need to - * make sure that both paths are absolute paths. If we don't, - * we can end up with an unexpected absolute path that the user - * didn't want. - */ - struct strbuf buf = STRBUF_INIT, realbuf = STRBUF_INIT, prefixbuf = STRBUF_INIT; - if (!is_absolute_path(path)) { - strbuf_realpath_forgiving(&realbuf, path, 1); - path = realbuf.buf; - } - if (!is_absolute_path(prefix)) { - strbuf_realpath_forgiving(&prefixbuf, prefix, 1); - prefix = prefixbuf.buf; - } - puts(relative_path(path, prefix, &buf)); - strbuf_release(&buf); - strbuf_release(&realbuf); - strbuf_release(&prefixbuf); - } else if (format == FORMAT_DEFAULT && def == DEFAULT_RELATIVE_IF_SHARED) { - struct strbuf buf = STRBUF_INIT; - puts(relative_path(path, prefix, &buf)); - strbuf_release(&buf); - } else { - struct strbuf buf = STRBUF_INIT; - strbuf_realpath_forgiving(&buf, path, 1); - puts(buf.buf); - strbuf_release(&buf); - } - free(cwd); + struct strbuf sb = STRBUF_INIT; + + strbuf_add_path(&sb, path, prefix, format, def); + puts(sb.buf); + + strbuf_release(&sb); } int cmd_rev_parse(int argc, @@ -717,7 +659,7 @@ int cmd_rev_parse(int argc, const char *name = NULL; struct strbuf buf = STRBUF_INIT; int seen_end_of_options = 0; - enum format_type format = FORMAT_DEFAULT; + enum path_format_type format = PATH_FORMAT_DEFAULT; show_usage_if_asked(argc, argv, builtin_rev_parse_usage); @@ -798,7 +740,7 @@ int cmd_rev_parse(int argc, print_path(repo_git_path_replace(the_repository, &buf, "%s", argv[i + 1]), prefix, format, - DEFAULT_RELATIVE_IF_SHARED); + PATH_DEFAULT_RELATIVE_IF_SHARED); i++; continue; } @@ -820,9 +762,9 @@ int cmd_rev_parse(int argc, if (!arg) die(_("--path-format requires an argument")); if (!strcmp(arg, "absolute")) { - format = FORMAT_CANONICAL; + format = PATH_FORMAT_CANONICAL; } else if (!strcmp(arg, "relative")) { - format = FORMAT_RELATIVE; + format = PATH_FORMAT_RELATIVE; } else { die(_("unknown argument to --path-format: %s"), arg); } @@ -985,7 +927,7 @@ int cmd_rev_parse(int argc, if (!strcmp(arg, "--show-toplevel")) { const char *work_tree = repo_get_work_tree(the_repository); if (work_tree) - print_path(work_tree, prefix, format, DEFAULT_UNMODIFIED); + print_path(work_tree, prefix, format, PATH_DEFAULT_UNMODIFIED); else die(_("this operation must be run in a work tree")); continue; @@ -993,7 +935,7 @@ int cmd_rev_parse(int argc, if (!strcmp(arg, "--show-superproject-working-tree")) { struct strbuf superproject = STRBUF_INIT; if (get_superproject_working_tree(&superproject)) - print_path(superproject.buf, prefix, format, DEFAULT_UNMODIFIED); + print_path(superproject.buf, prefix, format, PATH_DEFAULT_UNMODIFIED); strbuf_release(&superproject); continue; } @@ -1028,18 +970,18 @@ int cmd_rev_parse(int argc, const char *gitdir = getenv(GIT_DIR_ENVIRONMENT); char *cwd; int len; - enum format_type wanted = format; + enum path_format_type wanted = format; if (arg[2] == 'g') { /* --git-dir */ if (gitdir) { - print_path(gitdir, prefix, format, DEFAULT_UNMODIFIED); + print_path(gitdir, prefix, format, PATH_DEFAULT_UNMODIFIED); continue; } if (!prefix) { - print_path(".git", prefix, format, DEFAULT_UNMODIFIED); + print_path(".git", prefix, format, PATH_DEFAULT_UNMODIFIED); continue; } } else { /* --absolute-git-dir */ - wanted = FORMAT_CANONICAL; + wanted = PATH_FORMAT_CANONICAL; if (!gitdir && !prefix) gitdir = ".git"; if (gitdir) { @@ -1055,11 +997,11 @@ int cmd_rev_parse(int argc, strbuf_reset(&buf); strbuf_addf(&buf, "%s%s.git", cwd, len && cwd[len-1] != '/' ? "/" : ""); free(cwd); - print_path(buf.buf, prefix, wanted, DEFAULT_CANONICAL); + print_path(buf.buf, prefix, wanted, PATH_DEFAULT_CANONICAL); continue; } if (!strcmp(arg, "--git-common-dir")) { - print_path(repo_get_common_dir(the_repository), prefix, format, DEFAULT_RELATIVE_IF_SHARED); + print_path(repo_get_common_dir(the_repository), prefix, format, PATH_DEFAULT_RELATIVE_IF_SHARED); continue; } if (!strcmp(arg, "--is-inside-git-dir")) { @@ -1089,7 +1031,7 @@ int cmd_rev_parse(int argc, if (the_repository->index->split_index) { const struct object_id *oid = &the_repository->index->split_index->base_oid; const char *path = repo_git_path_replace(the_repository, &buf, "sharedindex.%s", oid_to_hex(oid)); - print_path(path, prefix, format, DEFAULT_RELATIVE); + print_path(path, prefix, format, PATH_DEFAULT_RELATIVE); } continue; }
-- 2.54.0