Hi Junio
On 27/06/2023 20:44, Junio C Hamano wrote:
Phillip Wood <phillip.wood123@xxxxxxxxx> writes:
From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
In some shells, such as bash and zsh, it's possible to use a command
substitution to provide the output of a command as a file argument to
another process, like so:
diff -u <(printf "a\nb\n") <(printf "a\nc\n")
However, this syntax does not produce useful results with "git diff
--no-index". On macOS, the arguments to the command are named pipes
under /dev/fd, and git diff doesn't know how to handle a named pipe. On
Linux, the arguments are symlinks to pipes, so git diff "helpfully"
diffs these symlinks, comparing their targets like "pipe:[1234]" and
"pipe:[5678]".
To address this "diff --no-index" is changed so that if a path given on
the commandline is a named pipe or a symbolic link that resolves to a
named pipe then we read the data to diff from that pipe. This is
implemented by generalizing the code that already exists to handle
reading from stdin when the user passes the path "-".
As process substitution is not support by POSIX this change is tested by
using a pipe and a symbolic link to a pipe.
Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx>
---
diff-no-index.c | 80 ++++++++++++++++++++++++----------------
t/t4053-diff-no-index.sh | 25 +++++++++++++
2 files changed, 73 insertions(+), 32 deletions(-)
This looks good, if a bit invasive, to a cursory read, at least to
me. It is very focused to the real problem at hand, and shows that
the way we split the "no-index" mode out to its own implementation
of filespec population code does make sense.
Yes, it is more invasive than I'd like but I think that stems from
needing to treat paths given on the commandline differently to the paths
we find when recursing directories.
-static void populate_from_stdin(struct diff_filespec *s)
+static void populate_from_pipe(struct diff_filespec *s, int is_stdin)
{
struct strbuf buf = STRBUF_INIT;
size_t size = 0;
+ int fd = 0;
- if (strbuf_read(&buf, 0, 0) < 0)
+ if (!is_stdin)
+ fd = xopen(s->path, O_RDONLY);
+ if (strbuf_read(&buf, fd, 0) < 0)
die_errno("error while reading from stdin");
+ if (!is_stdin)
+ close(fd);
Given that the error message explicitly says "stdin", and there are
many "if ([!]is_stdin)" sprinkled in the code, I actually suspect
that there should be two separate helpers, one for stdin and one for
non-stdin pipe. It is especially true since there is only one
caller that does this:
+ if (is_pipe)
+ populate_from_pipe(s, name == file_from_standard_input);
which can be
if (is_pipe) {
if (name == file_from_standard_input)
populate_from_stdin(s);
else
populate_from_pipe(s);
}
without losing clarity. The code that you are sharing by forcing
them to be a single helper to wrap up a handful of members in the s
structure can become its own helper that is called from these two
helper functions.
Sure, and thanks for pointing out the error message, I'd overlooked that.
static int queue_diff(struct diff_options *o,
- const char *name1, const char *name2)
+ const char *name1, int is_pipe1,
+ const char *name2, int is_pipe2)
{
int mode1 = 0, mode2 = 0;
- if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
+ if (get_mode(name1, is_pipe1, &mode1) ||
+ get_mode(name2, is_pipe2, &mode2))
return -1;
Makes me wonder why the caller of queue_diff() even needs to know if
these two names are pipes; we are calling get_mode() which would run
stat(2) anyway, and the result from stat(2) is what you use (in the
caller) to determine the values of is_pipeN. Wouldn't it be more
appropriate to leave the caller oblivious of special casing of the
pipes and let get_mode() handle this? After all, that is how the
existing code special cases the standard input so there is a strong
precedence.
Maybe is_pipeN should be called force_pipeN. We only want to
de-reference symbolic links to pipes for paths that are given on the
command line, not when the the user asked to compare two directories.
That means we need to pass some kind of flag around to say whether we're
recursing or not. An earlier draft of this series had a recursing flag
rather than is_pipeN like this
-static int get_mode(const char *path, int *mode)
+static int get_mode(const char *path, int *mode, int recursing)
{
struct stat st;
if (!path || !strcmp(path, "/dev/null"))
*mode = 0;
#ifdef GIT_WINDOWS_NATIVE
else if (!strcasecmp(path, "nul"))
*mode = 0;
#endif
else if (path == file_from_standard_input)
*mode = create_ce_mode(0666);
else if (lstat(path, &st))
return error("Could not access '%s'", path);
else
*mode = st.st_mode;
+
+ /*
+ * For paths given on the command line de-reference symbolic
+ * links that resolve to a fifo.
+ */
+ if (!recursing &&
+ S_ISLNK(*mode) && !stat(path, &st) && S_ISFIFO(st.st_mode))
+ *mode = st.st_mode;
+
return 0;
}
I dropped it in favor of is_pipeN after I realized we need to check if
the paths on the command line are pipes before calling fixup_paths(). I
think we could use the "special" parameter you suggest below as a
recursion indicator by setting it to NULL when recursing.
If we go that route, it may make sense to further isolate the
"address comparison" trick used for the standard input mode.
Perhaps we can and do something like
static int get_mode(const char *path, int *mode, int *special)
{
struct stat st;
+ *special = 0; /* default - nothing special */
...
else if (path == file_from_standard_input) {
*mode = create_ce_mode(0666);
+ *pipe_kind = 1; /* STDIN */
+ } else if (stat(path, &st)) {
+ ... error ...
+ } else if (S_ISFIFO(st.st_mode)) {
+ *mode = create_ce_mode(0666);
+ *pipe_kind = 2; /* FIFO */
} else if (lstat(path, &st)) {
... error ...
} else {
*mode = st.st_mode;
}
and have the caller act on "special" to choose among calling
populate_from_stdin(), populate_from_pipe(), or do nothing for
the regular files?
Side note: this has an added benefit of highlighting that we do
stat() and lstat() because of dereferencing. What I suspect is
that "git diff --no-index" mode was primarily to give Git
niceties like rename detection and diff algorithms to those who
wanted to use in contexts (i.e. contents not tracked by Git)
they use "diff" by other people like GNU, without bothering to
update "diff" by other people. I further suspect that "compare
the readlink contents", which is very much necessary within the
Git context, may not fall into the "Git niceties" when they
invoke "--no-index" mode. Which leads me to imagine a future
direction where we only use stat() and not lstat() in the
"--no-index" codepath. Having everything including these
lstat() and stat() calls inside get_mode() will allow such a
future transition hopefully simpler.
I do not quite see why you decided to move the "is_dir" processing
up and made the caller responsible.
To avoid a second stat() call in is_directory() after we've already
called stat() to see if the path is a pipe.
Specifically,
- fixup_paths(paths, &replacement);
+ if (!is_pipe[0] && !is_pipe[1])
+ fixup_paths(paths, is_dir, &replacement);
this seems fishy when one side is pipe and the other one is not.
When the user says
$ git diff --no-index <(command) path
fixup_paths() are bypassed because one of them is pipe. It makes me
suspect that it should be an error if "path" is a directory. I do
not know if fixup_paths() is the best place for doing such checking,
but somebody should be doing that, no?
I wasn't sure what was best to do in that case. In the end I went with
making the behavior the same as "git diff --no-index -- - directory".
I'm happy to make both an error.
Thanks for your comments, I'll leave it a couple of days to see if there
are any more comments and then re-roll.
Phillip
