From: Phillip Wood Date: Tue, 16 Jun 2026 13:08:37 GMT Subject: Re: [GSoC Patch v5 2/4] rev-parse: use append_formatted_path() for path formatting Message-ID: <0077b1ae-3c85-4b34-a0ac-766395157c4f@gmail.com> In-Reply-To: <20260616044953.184806-3-jayatheerthkulkarni2005@gmail.com> On 16/06/2026 05:49, K Jayatheerth wrote: > -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 arg_path_format, enum path_format def_format) > { > - 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; > + /* If the user didn't explicitly specify a format, fallback to the path-specific default. */ > + enum path_format fmt = (arg_path_format != PATH_FORMAT_DEFAULT) ? arg_path_format : def_format; > + > + append_formatted_path(&sb, path, prefix, fmt); > + puts(sb.buf); > + > + strbuf_release(&sb); > } > > int cmd_rev_parse(int argc, > @@ -717,7 +661,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 arg_path_format = PATH_FORMAT_DEFAULT; This is the source of the api wart I referred to in the previous patch. Could we keep the existing enums and convert them into the appropriate PATH_FORMAT_* flag in print_path() above? I think we already have the logic to do that in the existing code. That would mean that other users of append_formatted_path() don't have to worry about the extra flag. Thanks Phillip > > show_usage_if_asked(argc, argv, builtin_rev_parse_usage); > > @@ -797,8 +741,8 @@ int cmd_rev_parse(int argc, > die(_("--git-path requires an argument")); > print_path(repo_git_path_replace(the_repository, &buf, > "%s", argv[i + 1]), prefix, > - format, > - DEFAULT_RELATIVE_IF_SHARED); > + arg_path_format, > + PATH_FORMAT_RELATIVE_IF_SHARED); > i++; > continue; > } > @@ -820,9 +764,9 @@ int cmd_rev_parse(int argc, > if (!arg) > die(_("--path-format requires an argument")); > if (!strcmp(arg, "absolute")) { > - format = FORMAT_CANONICAL; > + arg_path_format = PATH_FORMAT_CANONICAL; > } else if (!strcmp(arg, "relative")) { > - format = FORMAT_RELATIVE; > + arg_path_format = PATH_FORMAT_RELATIVE; > } else { > die(_("unknown argument to --path-format: %s"), arg); > } > @@ -985,7 +929,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, arg_path_format, PATH_FORMAT_UNMODIFIED); > else > die(_("this operation must be run in a work tree")); > continue; > @@ -993,7 +937,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, arg_path_format, PATH_FORMAT_UNMODIFIED); > strbuf_release(&superproject); > continue; > } > @@ -1028,18 +972,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 wanted = arg_path_format; > if (arg[2] == 'g') { /* --git-dir */ > if (gitdir) { > - print_path(gitdir, prefix, format, DEFAULT_UNMODIFIED); > + print_path(gitdir, prefix, arg_path_format, PATH_FORMAT_UNMODIFIED); > continue; > } > if (!prefix) { > - print_path(".git", prefix, format, DEFAULT_UNMODIFIED); > + print_path(".git", prefix, arg_path_format, PATH_FORMAT_UNMODIFIED); > continue; > } > } else { /* --absolute-git-dir */ > - wanted = FORMAT_CANONICAL; > + wanted = PATH_FORMAT_CANONICAL; > if (!gitdir && !prefix) > gitdir = ".git"; > if (gitdir) { > @@ -1055,11 +999,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_FORMAT_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, arg_path_format, PATH_FORMAT_RELATIVE_IF_SHARED); > continue; > } > if (!strcmp(arg, "--is-inside-git-dir")) { > @@ -1089,7 +1033,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, arg_path_format, PATH_FORMAT_RELATIVE); > } > continue; > }