![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/show-diff.c b/show-diff.c
index 2bd789c261851e899bdf653c1fa59d39412c6f51..4557bd82f302eb951e02281a67a84c959122031b 100644 (file)
--- a/show-diff.c
+++ b/show-diff.c
*/
#include "cache.h"
-static char *diff_cmd = "diff -L '%s' -u -N - '%s'";
-
-/* Help to copy the thing properly quoted for the shell safety.
- * any single quote is replaced with '\'', and the caller is
- * expected to enclose the result within a single quote pair.
- *
- * E.g.
- * original sq_expand result
- * name ==> name ==> 'name'
- * a b ==> a b ==> 'a b'
- * a'b ==> a'\''b ==> 'a'\''b'
- *
- * NOTE! The returned memory belongs to this function so
- * do not free it.
- */
-static char *sq_expand(char *src)
-{
- static char *buf = NULL;
- int cnt, c;
- char *cp;
-
- /* count bytes needed to store the quoted string. */
- for (cnt = 1, cp = src; *cp; cnt++, cp++)
- if (*cp == '\'')
- cnt += 3;
-
- if (! (buf = malloc(cnt)))
- return buf;
- cp = buf;
- while ((c = *src++)) {
- if (c != '\'')
- *cp++ = c;
- else {
- cp = strcpy(cp, "'\\''");
- cp += 4;
- }
- }
- *cp = 0;
- return buf;
-}
-
-static void show_differences(char *name, void *old_contents,
- unsigned long long old_size)
-{
- FILE *f;
- char *name_sq = sq_expand(name);
- int cmd_size = strlen(name_sq) * 2 + strlen(diff_cmd);
- char *cmd = malloc(cmd_size);
-
- snprintf(cmd, cmd_size, diff_cmd, name_sq, name_sq);
- f = popen(cmd, "w");
- if (old_size)
- fwrite(old_contents, old_size, 1, f);
- pclose(f);
- free(name_sq);
- free(cmd);
-}
-
-static void show_diff_empty(struct cache_entry *ce)
-{
- char *old;
- unsigned long int size;
- int lines=0;
- unsigned char type[20], *p, *end;
-
- old = read_sha1_file(ce->sha1, type, &size);
- if (size > 0) {
- int startline = 1;
- int c = 0;
-
- printf("--- %s\n", ce->name);
- printf("+++ /dev/null\n");
- p = old;
- end = old + size;
- while (p < end)
- if (*p++ == '\n')
- lines ++;
- printf("@@ -1,%d +0,0 @@\n", lines);
- p = old;
- while (p < end) {
- c = *p++;
- if (startline) {
- putchar('-');
- startline = 0;
- }
- putchar(c);
- if (c == '\n')
- startline = 1;
- }
- if (c!='\n')
- printf("\n");
- fflush(stdout);
- }
-}
-
static const char *show_diff_usage = "show-diff [-q] [-s] [-z] [paths...]";
+static int recursive = 0;
+static int line_termination = '\n';
+static int silent = 0;
+static int silent_on_nonexisting_files = 0;
+
static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
{
int i;
return 0;
}
+static void show_file(const char *prefix, struct cache_entry *ce)
+{
+ printf("%s%o\t%s\t%s\t%s%c", prefix, ntohl(ce->ce_mode), "blob",
+ sha1_to_hex(ce->sha1), ce->name, line_termination);
+}
+
int main(int argc, char **argv)
{
- int silent = 0;
- int silent_on_nonexisting_files = 0;
- int machine_readable = 0;
+ static const char null_sha1_hex[] = "0000000000000000000000000000000000000000";
int entries = read_cache();
int i;
else if (!strcmp(argv[1], "-q"))
silent_on_nonexisting_files = 1;
else if (!strcmp(argv[1], "-z"))
- machine_readable = 1;
+ line_termination = 0;
+ else if (!strcmp(argv[1], "-r"))
+ recursive = 1; /* No-op */
else
usage(show_diff_usage);
argv++; argc--;
perror("read_cache");
exit(1);
}
+
for (i = 0; i < entries; i++) {
struct stat st;
+ unsigned int oldmode, mode;
struct cache_entry *ce = active_cache[i];
int changed;
- unsigned long size;
- char type[20];
- void *old;
if (1 < argc &&
! matches_pathspec(ce, argv+1, argc-1))
continue;
if (ce_stage(ce)) {
- if (machine_readable)
- printf("U %s%c", ce->name, 0);
- else
- printf("%s: Unmerged\n",
- ce->name);
+ printf("U %s%c", ce->name, line_termination);
+
while (i < entries &&
!strcmp(ce->name, active_cache[i]->name))
i++;
}
if (stat(ce->name, &st) < 0) {
- if (errno == ENOENT && silent_on_nonexisting_files)
+ if (errno != ENOENT) {
+ perror(ce->name);
+ continue;
+ }
+ if (silent_on_nonexisting_files)
continue;
- if (machine_readable)
- printf("X %s%c", ce->name, 0);
- else {
- printf("%s: %s\n", ce->name, strerror(errno));
- if (errno == ENOENT)
- show_diff_empty(ce);
- }
+ show_file("-", ce);
continue;
}
changed = cache_match_stat(ce, &st);
if (!changed)
continue;
- if (!machine_readable)
- printf("%s: %s\n", ce->name, sha1_to_hex(ce->sha1));
- else {
- printf("%s %s%c", sha1_to_hex(ce->sha1), ce->name, 0);
- continue;
- }
- fflush(stdout);
- if (silent)
- continue;
- old = read_sha1_file(ce->sha1, type, &size);
- show_differences(ce->name, old, size);
- free(old);
+ oldmode = ntohl(ce->ce_mode);
+ mode = S_IFREG | ce_permissions(st.st_mode);
+
+ printf("*%o->%o\t%s\t%s->%s\t%s%c",
+ oldmode, mode, "blob",
+ sha1_to_hex(ce->sha1), null_sha1_hex,
+ ce->name, line_termination);
}
return 0;
}