[PATCH] diff overhaul
[git.git] / diff-files.c
1 /*
2  * GIT - The information manager from hell
3  *
4  * Copyright (C) Linus Torvalds, 2005
5  */
6 #include "cache.h"
7 #include "diff.h"
8
9 static const char *diff_files_usage =
10 "git-diff-files [-p] [-q] [-r] [-z] [-M] [-R] [paths...]";
11
12 static int generate_patch = 0;
13 static int line_termination = '\n';
14 static int detect_rename = 0;
15 static int reverse_diff = 0;
16 static int diff_score_opt = 0;
17 static int silent = 0;
18
19 static int matches_pathspec(struct cache_entry *ce, char **spec, int cnt)
20 {
21         int i;
22         int namelen = ce_namelen(ce);
23         for (i = 0; i < cnt; i++) {
24                 int speclen = strlen(spec[i]);
25                 if (! strncmp(spec[i], ce->name, speclen) &&
26                     speclen <= namelen &&
27                     (ce->name[speclen] == 0 ||
28                      ce->name[speclen] == '/'))
29                         return 1;
30         }
31         return 0;
32 }
33
34 static void show_unmerge(const char *path)
35 {
36         diff_unmerge(path);
37 }
38
39 static void show_file(int pfx, struct cache_entry *ce)
40 {
41         diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL);
42 }
43
44 static void show_modified(int oldmode, int mode,
45                           const unsigned char *old_sha1, const unsigned char *sha1,
46                           char *path)
47 {
48         diff_change(oldmode, mode, old_sha1, sha1, path, NULL);
49 }
50
51 int main(int argc, char **argv)
52 {
53         static const unsigned char null_sha1[20] = { 0, };
54         int entries = read_cache();
55         int i;
56
57         while (1 < argc && argv[1][0] == '-') {
58                 if (!strcmp(argv[1], "-p"))
59                         generate_patch = 1;
60                 else if (!strcmp(argv[1], "-q"))
61                         silent = 1;
62                 else if (!strcmp(argv[1], "-r"))
63                         ; /* no-op */
64                 else if (!strcmp(argv[1], "-s"))
65                         ; /* no-op */
66                 else if (!strcmp(argv[1], "-z"))
67                         line_termination = 0;
68                 else if (!strcmp(argv[1], "-R"))
69                         reverse_diff = 1;
70                 else if (!strncmp(argv[1], "-M", 2)) {
71                         diff_score_opt = diff_scoreopt_parse(argv[1]);
72                         detect_rename = generate_patch = 1;
73                 }
74                 else
75                         usage(diff_files_usage);
76                 argv++; argc--;
77         }
78
79         /* At this point, if argc == 1, then we are doing everything.
80          * Otherwise argv[1] .. argv[argc-1] have the explicit paths.
81          */
82         if (entries < 0) {
83                 perror("read_cache");
84                 exit(1);
85         }
86
87         diff_setup(detect_rename, diff_score_opt, reverse_diff,
88                    (generate_patch ? -1 : line_termination),
89                    0, 0);
90
91         for (i = 0; i < entries; i++) {
92                 struct stat st;
93                 unsigned int oldmode, mode;
94                 struct cache_entry *ce = active_cache[i];
95                 int changed;
96
97                 if (1 < argc &&
98                     ! matches_pathspec(ce, argv+1, argc-1))
99                         continue;
100
101                 if (ce_stage(ce)) {
102                         show_unmerge(ce->name);
103                         while (i < entries &&
104                                !strcmp(ce->name, active_cache[i]->name))
105                                 i++;
106                         i--; /* compensate for loop control increments */
107                         continue;
108                 }
109
110                 if (lstat(ce->name, &st) < 0) {
111                         if (errno != ENOENT) {
112                                 perror(ce->name);
113                                 continue;
114                         }
115                         if (silent)
116                                 continue;
117                         show_file('-', ce);
118                         continue;
119                 }
120                 changed = ce_match_stat(ce, &st);
121                 if (!changed)
122                         continue;
123
124                 oldmode = ntohl(ce->ce_mode);
125                 mode = (S_ISLNK(st.st_mode) ? S_IFLNK :
126                         S_IFREG | ce_permissions(st.st_mode));
127
128                 show_modified(oldmode, mode, ce->sha1, null_sha1,
129                               ce->name);
130         }
131         diff_flush();
132         return 0;
133 }