2005-04-07 22:16:10 +00:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2005-04-07 22:13:13 +00:00
|
|
|
#include "cache.h"
|
2005-04-27 16:21:00 +00:00
|
|
|
#include "diff.h"
|
2005-04-12 09:04:44 +00:00
|
|
|
|
2005-04-30 20:59:38 +00:00
|
|
|
static const char *diff_files_usage =
|
2005-05-20 02:00:36 +00:00
|
|
|
"git-diff-files [-p] [-q] [-r] [-z] [-M] [-R] [paths...]";
|
2005-04-17 04:29:45 +00:00
|
|
|
|
2005-04-27 16:21:00 +00:00
|
|
|
static int generate_patch = 0;
|
2005-04-27 00:17:36 +00:00
|
|
|
static int line_termination = '\n';
|
2005-05-19 10:32:35 +00:00
|
|
|
static int detect_rename = 0;
|
2005-05-20 02:00:36 +00:00
|
|
|
static int reverse_diff = 0;
|
|
|
|
static int diff_score_opt = 0;
|
2005-04-27 00:17:36 +00:00
|
|
|
static int silent = 0;
|
|
|
|
|
2005-04-17 04:29:45 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2005-04-27 16:21:00 +00:00
|
|
|
static void show_unmerge(const char *path)
|
2005-04-27 00:17:36 +00:00
|
|
|
{
|
2005-05-20 02:00:36 +00:00
|
|
|
diff_unmerge(path);
|
2005-04-27 16:21:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void show_file(int pfx, struct cache_entry *ce)
|
|
|
|
{
|
2005-05-20 02:00:36 +00:00
|
|
|
diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL);
|
2005-04-27 16:21:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void show_modified(int oldmode, int mode,
|
2005-05-18 12:14:09 +00:00
|
|
|
const unsigned char *old_sha1, const unsigned char *sha1,
|
2005-04-27 16:21:00 +00:00
|
|
|
char *path)
|
|
|
|
{
|
2005-05-20 02:00:36 +00:00
|
|
|
diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
|
2005-04-27 00:17:36 +00:00
|
|
|
}
|
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
2005-05-18 12:14:09 +00:00
|
|
|
static const unsigned char null_sha1[20] = { 0, };
|
2005-04-07 22:13:13 +00:00
|
|
|
int entries = read_cache();
|
|
|
|
int i;
|
|
|
|
|
2005-04-17 04:29:45 +00:00
|
|
|
while (1 < argc && argv[1][0] == '-') {
|
2005-04-27 22:22:02 +00:00
|
|
|
if (!strcmp(argv[1], "-p"))
|
2005-04-27 16:21:00 +00:00
|
|
|
generate_patch = 1;
|
2005-04-17 04:29:45 +00:00
|
|
|
else if (!strcmp(argv[1], "-q"))
|
2005-04-27 22:22:02 +00:00
|
|
|
silent = 1;
|
2005-04-27 00:17:36 +00:00
|
|
|
else if (!strcmp(argv[1], "-r"))
|
2005-04-27 16:21:00 +00:00
|
|
|
; /* no-op */
|
2005-04-27 22:22:02 +00:00
|
|
|
else if (!strcmp(argv[1], "-s"))
|
|
|
|
; /* no-op */
|
|
|
|
else if (!strcmp(argv[1], "-z"))
|
|
|
|
line_termination = 0;
|
2005-05-20 02:00:36 +00:00
|
|
|
else if (!strcmp(argv[1], "-R"))
|
|
|
|
reverse_diff = 1;
|
|
|
|
else if (!strncmp(argv[1], "-M", 2)) {
|
|
|
|
diff_score_opt = diff_scoreopt_parse(argv[1]);
|
2005-05-19 10:32:35 +00:00
|
|
|
detect_rename = generate_patch = 1;
|
|
|
|
}
|
2005-04-17 04:29:45 +00:00
|
|
|
else
|
2005-04-30 20:59:38 +00:00
|
|
|
usage(diff_files_usage);
|
2005-04-17 04:29:45 +00:00
|
|
|
argv++; argc--;
|
2005-04-13 08:40:09 +00:00
|
|
|
}
|
|
|
|
|
2005-04-17 04:29:45 +00:00
|
|
|
/* At this point, if argc == 1, then we are doing everything.
|
|
|
|
* Otherwise argv[1] .. argv[argc-1] have the explicit paths.
|
|
|
|
*/
|
2005-04-07 22:13:13 +00:00
|
|
|
if (entries < 0) {
|
|
|
|
perror("read_cache");
|
|
|
|
exit(1);
|
|
|
|
}
|
2005-04-26 16:25:05 +00:00
|
|
|
|
2005-05-20 02:00:36 +00:00
|
|
|
diff_setup(detect_rename, diff_score_opt, reverse_diff,
|
|
|
|
(generate_patch ? -1 : line_termination),
|
2005-05-20 18:46:10 +00:00
|
|
|
NULL, 0);
|
2005-05-19 10:32:35 +00:00
|
|
|
|
2005-04-07 22:13:13 +00:00
|
|
|
for (i = 0; i < entries; i++) {
|
|
|
|
struct stat st;
|
2005-04-27 00:17:36 +00:00
|
|
|
unsigned int oldmode, mode;
|
2005-04-07 22:13:13 +00:00
|
|
|
struct cache_entry *ce = active_cache[i];
|
2005-04-17 04:29:45 +00:00
|
|
|
int changed;
|
2005-04-07 22:13:13 +00:00
|
|
|
|
2005-04-17 04:29:45 +00:00
|
|
|
if (1 < argc &&
|
2005-04-17 04:29:45 +00:00
|
|
|
! matches_pathspec(ce, argv+1, argc-1))
|
|
|
|
continue;
|
|
|
|
|
2005-04-17 04:29:45 +00:00
|
|
|
if (ce_stage(ce)) {
|
2005-04-27 16:21:00 +00:00
|
|
|
show_unmerge(ce->name);
|
2005-04-17 04:29:45 +00:00
|
|
|
while (i < entries &&
|
|
|
|
!strcmp(ce->name, active_cache[i]->name))
|
|
|
|
i++;
|
|
|
|
i--; /* compensate for loop control increments */
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-20 02:00:36 +00:00
|
|
|
|
2005-05-06 13:45:01 +00:00
|
|
|
if (lstat(ce->name, &st) < 0) {
|
2005-05-20 16:48:38 +00:00
|
|
|
if (errno != ENOENT && errno != ENOTDIR) {
|
2005-04-27 00:17:36 +00:00
|
|
|
perror(ce->name);
|
2005-04-15 22:08:09 +00:00
|
|
|
continue;
|
2005-05-20 02:00:36 +00:00
|
|
|
}
|
2005-04-27 22:22:02 +00:00
|
|
|
if (silent)
|
2005-04-27 00:17:36 +00:00
|
|
|
continue;
|
2005-04-27 16:21:00 +00:00
|
|
|
show_file('-', ce);
|
2005-04-07 22:13:13 +00:00
|
|
|
continue;
|
|
|
|
}
|
2005-05-15 02:04:25 +00:00
|
|
|
changed = ce_match_stat(ce, &st);
|
2005-04-12 09:01:12 +00:00
|
|
|
if (!changed)
|
2005-04-07 22:13:13 +00:00
|
|
|
continue;
|
2005-04-13 08:40:09 +00:00
|
|
|
|
2005-04-27 00:17:36 +00:00
|
|
|
oldmode = ntohl(ce->ce_mode);
|
2005-05-12 23:51:08 +00:00
|
|
|
mode = (S_ISLNK(st.st_mode) ? S_IFLNK :
|
|
|
|
S_IFREG | ce_permissions(st.st_mode));
|
2005-04-27 00:17:36 +00:00
|
|
|
|
2005-04-27 16:21:00 +00:00
|
|
|
show_modified(oldmode, mode, ce->sha1, null_sha1,
|
|
|
|
ce->name);
|
2005-04-07 22:13:13 +00:00
|
|
|
}
|
2005-05-20 02:00:36 +00:00
|
|
|
diff_flush();
|
2005-04-07 22:13:13 +00:00
|
|
|
return 0;
|
|
|
|
}
|