#include "cache.h"
#include "diff.h"
-static const char *show_diff_usage =
-"show-diff [-p] [-q] [-r] [-z] [paths...]";
+static const char *diff_files_usage =
+"git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [-S<string>] [-O<orderfile>] [paths...]";
-static int generate_patch = 0;
-static int line_termination = '\n';
+static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int detect_rename = 0;
+static int diff_setup_opt = 0;
+static int diff_score_opt = 0;
+static const char *pickaxe = NULL;
+static int pickaxe_opts = 0;
+static int diff_break_opt = -1;
+static const char *orderfile = NULL;
static int silent = 0;
-static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
-{
- int i;
- int namelen = ce_namelen(ce);
- for (i = 0; i < cnt; i++) {
- int speclen = strlen(spec[i]);
- if (! strncmp(spec[i], ce->name, speclen) &&
- speclen <= namelen &&
- (ce->name[speclen] == 0 ||
- ce->name[speclen] == '/'))
- return 1;
- }
- return 0;
-}
-
static void show_unmerge(const char *path)
{
- if (generate_patch)
- diff_unmerge(path);
- else
- printf("U %s%c", path, line_termination);
+ diff_unmerge(path);
}
static void show_file(int pfx, struct cache_entry *ce)
{
- if (generate_patch)
- diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1,
- ce->name, NULL);
- else
- printf("%c%06o\t%s\t%s\t%s%c",
- pfx, ntohl(ce->ce_mode), "blob",
- sha1_to_hex(ce->sha1), ce->name, line_termination);
+ diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL);
}
static void show_modified(int oldmode, int mode,
- const char *old_sha1, const char *sha1,
+ const unsigned char *old_sha1, const unsigned char *sha1,
char *path)
{
- char old_sha1_hex[41];
- strcpy(old_sha1_hex, sha1_to_hex(old_sha1));
-
- if (generate_patch)
- diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
- else
- printf("*%06o->%06o\tblob\t%s->%s\t%s%c",
- oldmode, mode, old_sha1_hex, sha1_to_hex(sha1), path,
- line_termination);
+ diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
}
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
{
- static const char null_sha1[20] = { 0, };
+ static const unsigned char null_sha1[20] = { 0, };
int entries = read_cache();
int i;
while (1 < argc && argv[1][0] == '-') {
if (!strcmp(argv[1], "-p"))
- generate_patch = 1;
+ diff_output_format = DIFF_FORMAT_PATCH;
else if (!strcmp(argv[1], "-q"))
silent = 1;
else if (!strcmp(argv[1], "-r"))
else if (!strcmp(argv[1], "-s"))
; /* no-op */
else if (!strcmp(argv[1], "-z"))
- line_termination = 0;
+ diff_output_format = DIFF_FORMAT_MACHINE;
+ else if (!strcmp(argv[1], "-R"))
+ diff_setup_opt |= DIFF_SETUP_REVERSE;
+ else if (!strncmp(argv[1], "-S", 2))
+ pickaxe = argv[1] + 2;
+ else if (!strncmp(argv[1], "-O", 2))
+ orderfile = argv[1] + 2;
+ else if (!strcmp(argv[1], "--pickaxe-all"))
+ pickaxe_opts = DIFF_PICKAXE_ALL;
+ else if (!strncmp(argv[1], "-B", 2)) {
+ if ((diff_break_opt =
+ diff_scoreopt_parse(argv[1])) == -1)
+ usage(diff_files_usage);
+ }
+ else if (!strncmp(argv[1], "-M", 2)) {
+ if ((diff_score_opt =
+ diff_scoreopt_parse(argv[1])) == -1)
+ usage(diff_files_usage);
+ detect_rename = DIFF_DETECT_RENAME;
+ }
+ else if (!strncmp(argv[1], "-C", 2)) {
+ if ((diff_score_opt =
+ diff_scoreopt_parse(argv[1])) == -1)
+ usage(diff_files_usage);
+ detect_rename = DIFF_DETECT_COPY;
+ }
else
- usage(show_diff_usage);
+ usage(diff_files_usage);
argv++; argc--;
}
exit(1);
}
+ diff_setup(diff_setup_opt);
+
for (i = 0; i < entries; i++) {
struct stat st;
- unsigned int oldmode, mode;
+ unsigned int oldmode;
struct cache_entry *ce = active_cache[i];
int changed;
- if (1 < argc &&
- ! matches_pathspec(ce, argv+1, argc-1))
- continue;
-
if (ce_stage(ce)) {
show_unmerge(ce->name);
while (i < entries &&
i--; /* compensate for loop control increments */
continue;
}
-
- if (stat(ce->name, &st) < 0) {
- if (errno != ENOENT) {
+
+ if (lstat(ce->name, &st) < 0) {
+ if (errno != ENOENT && errno != ENOTDIR) {
perror(ce->name);
continue;
- }
+ }
if (silent)
continue;
show_file('-', ce);
continue;
}
- changed = cache_match_stat(ce, &st);
- if (!changed)
+ changed = ce_match_stat(ce, &st);
+ if (!changed && detect_rename < DIFF_DETECT_COPY)
continue;
oldmode = ntohl(ce->ce_mode);
- mode = S_IFREG | ce_permissions(st.st_mode);
-
- show_modified(oldmode, mode, ce->sha1, null_sha1,
+ show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode),
+ ce->sha1, null_sha1,
ce->name);
}
+ diffcore_std((1 < argc) ? argv + 1 : NULL,
+ detect_rename, diff_score_opt,
+ pickaxe, pickaxe_opts,
+ diff_break_opt,
+ orderfile);
+ diff_flush(diff_output_format, 1);
return 0;
}