[PATCH] git-format-patch-script and mailinfo updates.
[alt-git.git] / diff-files.c
blob39dd54f80a7e81f7e67faf13ba79a0a8c9e077e7
1 /*
2 * GIT - The information manager from hell
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
7 #include "diff.h"
9 static const char *diff_files_usage =
10 "git-diff-files [-q] "
11 "[<common diff options>] [<path>...]"
12 COMMON_DIFF_OPTIONS_HELP;
14 static int diff_output_format = DIFF_FORMAT_RAW;
15 static int diff_line_termination = '\n';
16 static int detect_rename = 0;
17 static int find_copies_harder = 0;
18 static int diff_setup_opt = 0;
19 static int diff_score_opt = 0;
20 static const char *pickaxe = NULL;
21 static int pickaxe_opts = 0;
22 static int diff_break_opt = -1;
23 static const char *orderfile = NULL;
24 static const char *diff_filter = NULL;
25 static int silent = 0;
27 static void show_unmerge(const char *path)
29 diff_unmerge(path);
32 static void show_file(int pfx, struct cache_entry *ce)
34 diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL);
37 static void show_modified(int oldmode, int mode,
38 const unsigned char *old_sha1, const unsigned char *sha1,
39 char *path)
41 diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
44 int main(int argc, const char **argv)
46 static const unsigned char null_sha1[20] = { 0, };
47 const char **pathspec;
48 int entries = read_cache();
49 int i;
51 while (1 < argc && argv[1][0] == '-') {
52 if (!strcmp(argv[1], "-p") || !strcmp(argv[1], "-u"))
53 diff_output_format = DIFF_FORMAT_PATCH;
54 else if (!strcmp(argv[1], "-q"))
55 silent = 1;
56 else if (!strcmp(argv[1], "-r"))
57 ; /* no-op */
58 else if (!strcmp(argv[1], "-s"))
59 ; /* no-op */
60 else if (!strcmp(argv[1], "-z"))
61 diff_line_termination = 0;
62 else if (!strcmp(argv[1], "--name-only"))
63 diff_output_format = DIFF_FORMAT_NAME;
64 else if (!strcmp(argv[1], "-R"))
65 diff_setup_opt |= DIFF_SETUP_REVERSE;
66 else if (!strncmp(argv[1], "-S", 2))
67 pickaxe = argv[1] + 2;
68 else if (!strncmp(argv[1], "-O", 2))
69 orderfile = argv[1] + 2;
70 else if (!strncmp(argv[1], "--diff-filter=", 14))
71 diff_filter = argv[1] + 14;
72 else if (!strcmp(argv[1], "--pickaxe-all"))
73 pickaxe_opts = DIFF_PICKAXE_ALL;
74 else if (!strncmp(argv[1], "-B", 2)) {
75 if ((diff_break_opt =
76 diff_scoreopt_parse(argv[1])) == -1)
77 usage(diff_files_usage);
79 else if (!strncmp(argv[1], "-M", 2)) {
80 if ((diff_score_opt =
81 diff_scoreopt_parse(argv[1])) == -1)
82 usage(diff_files_usage);
83 detect_rename = DIFF_DETECT_RENAME;
85 else if (!strncmp(argv[1], "-C", 2)) {
86 if ((diff_score_opt =
87 diff_scoreopt_parse(argv[1])) == -1)
88 usage(diff_files_usage);
89 detect_rename = DIFF_DETECT_COPY;
91 else if (!strcmp(argv[1], "--find-copies-harder"))
92 find_copies_harder = 1;
93 else
94 usage(diff_files_usage);
95 argv++; argc--;
98 /* Do we have a pathspec? */
99 pathspec = (argc > 1) ? argv + 1 : NULL;
101 if (find_copies_harder && detect_rename != DIFF_DETECT_COPY)
102 usage(diff_files_usage);
104 /* At this point, if argc == 1, then we are doing everything.
105 * Otherwise argv[1] .. argv[argc-1] have the explicit paths.
107 if (entries < 0) {
108 perror("read_cache");
109 exit(1);
112 diff_setup(diff_setup_opt);
114 for (i = 0; i < entries; i++) {
115 struct stat st;
116 unsigned int oldmode;
117 struct cache_entry *ce = active_cache[i];
118 int changed;
120 if (!ce_path_match(ce, pathspec))
121 continue;
123 if (ce_stage(ce)) {
124 show_unmerge(ce->name);
125 while (i < entries &&
126 !strcmp(ce->name, active_cache[i]->name))
127 i++;
128 i--; /* compensate for loop control increments */
129 continue;
132 if (lstat(ce->name, &st) < 0) {
133 if (errno != ENOENT && errno != ENOTDIR) {
134 perror(ce->name);
135 continue;
137 if (silent)
138 continue;
139 show_file('-', ce);
140 continue;
142 changed = ce_match_stat(ce, &st);
143 if (!changed && !find_copies_harder)
144 continue;
145 oldmode = ntohl(ce->ce_mode);
146 show_modified(oldmode, DIFF_FILE_CANON_MODE(st.st_mode),
147 ce->sha1, (changed ? null_sha1 : ce->sha1),
148 ce->name);
150 diffcore_std(pathspec,
151 detect_rename, diff_score_opt,
152 pickaxe, pickaxe_opts,
153 diff_break_opt,
154 orderfile, diff_filter);
155 diff_flush(diff_output_format, diff_line_termination);
156 return 0;