]>
Commit | Line | Data |
---|---|---|
8bc9a0c7 LT |
1 | /* |
2 | * GIT - The information manager from hell | |
3 | * | |
4 | * Copyright (C) Linus Torvalds, 2005 | |
5 | */ | |
e83c5163 | 6 | #include "cache.h" |
4a6bf9e1 | 7 | #include "diff.h" |
c0fb976a | 8 | |
17710391 | 9 | static const char *diff_files_usage = |
427dcb4b | 10 | "git-diff-files [-p] [-q] [-r] [-z] [-M] [-C] [-R] [paths...]"; |
b8f80925 | 11 | |
4a6bf9e1 | 12 | static int generate_patch = 0; |
0a7668e9 | 13 | static int line_termination = '\n'; |
5c97558c | 14 | static int detect_rename = 0; |
57fe64a4 JH |
15 | static int reverse_diff = 0; |
16 | static int diff_score_opt = 0; | |
0a7668e9 | 17 | static int silent = 0; |
0a7668e9 | 18 | |
b8f80925 JH |
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 | ||
4a6bf9e1 | 34 | static void show_unmerge(const char *path) |
0a7668e9 | 35 | { |
57fe64a4 | 36 | diff_unmerge(path); |
4a6bf9e1 JH |
37 | } |
38 | ||
39 | static void show_file(int pfx, struct cache_entry *ce) | |
40 | { | |
57fe64a4 | 41 | diff_addremove(pfx, ntohl(ce->ce_mode), ce->sha1, ce->name, NULL); |
4a6bf9e1 JH |
42 | } |
43 | ||
44 | static void show_modified(int oldmode, int mode, | |
bf0f910d | 45 | const unsigned char *old_sha1, const unsigned char *sha1, |
4a6bf9e1 JH |
46 | char *path) |
47 | { | |
57fe64a4 | 48 | diff_change(oldmode, mode, old_sha1, sha1, path, NULL); |
0a7668e9 LT |
49 | } |
50 | ||
e83c5163 LT |
51 | int main(int argc, char **argv) |
52 | { | |
bf0f910d | 53 | static const unsigned char null_sha1[20] = { 0, }; |
e83c5163 LT |
54 | int entries = read_cache(); |
55 | int i; | |
56 | ||
b8f80925 | 57 | while (1 < argc && argv[1][0] == '-') { |
d15aa430 | 58 | if (!strcmp(argv[1], "-p")) |
4a6bf9e1 | 59 | generate_patch = 1; |
b8f80925 | 60 | else if (!strcmp(argv[1], "-q")) |
d15aa430 | 61 | silent = 1; |
0a7668e9 | 62 | else if (!strcmp(argv[1], "-r")) |
4a6bf9e1 | 63 | ; /* no-op */ |
d15aa430 JH |
64 | else if (!strcmp(argv[1], "-s")) |
65 | ; /* no-op */ | |
66 | else if (!strcmp(argv[1], "-z")) | |
67 | line_termination = 0; | |
57fe64a4 JH |
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]); | |
5c97558c JH |
72 | detect_rename = generate_patch = 1; |
73 | } | |
427dcb4b JH |
74 | else if (!strncmp(argv[1], "-C", 2)) { |
75 | diff_score_opt = diff_scoreopt_parse(argv[1]); | |
76 | detect_rename = 2; | |
77 | generate_patch = 1; | |
78 | } | |
b8f80925 | 79 | else |
17710391 | 80 | usage(diff_files_usage); |
b8f80925 | 81 | argv++; argc--; |
e2e5e98a PB |
82 | } |
83 | ||
b8f80925 JH |
84 | /* At this point, if argc == 1, then we are doing everything. |
85 | * Otherwise argv[1] .. argv[argc-1] have the explicit paths. | |
86 | */ | |
e83c5163 LT |
87 | if (entries < 0) { |
88 | perror("read_cache"); | |
89 | exit(1); | |
90 | } | |
be3cfa85 | 91 | |
57fe64a4 JH |
92 | diff_setup(detect_rename, diff_score_opt, reverse_diff, |
93 | (generate_patch ? -1 : line_termination), | |
e99d59ff | 94 | NULL, 0); |
5c97558c | 95 | |
e83c5163 LT |
96 | for (i = 0; i < entries; i++) { |
97 | struct stat st; | |
0a7668e9 | 98 | unsigned int oldmode, mode; |
e83c5163 | 99 | struct cache_entry *ce = active_cache[i]; |
d94c6128 | 100 | int changed; |
e83c5163 | 101 | |
d2522a65 | 102 | if (1 < argc && |
b8f80925 JH |
103 | ! matches_pathspec(ce, argv+1, argc-1)) |
104 | continue; | |
105 | ||
9fec8b26 | 106 | if (ce_stage(ce)) { |
4a6bf9e1 | 107 | show_unmerge(ce->name); |
9fec8b26 JH |
108 | while (i < entries && |
109 | !strcmp(ce->name, active_cache[i]->name)) | |
110 | i++; | |
111 | i--; /* compensate for loop control increments */ | |
112 | continue; | |
113 | } | |
57fe64a4 | 114 | |
ffbe1add | 115 | if (lstat(ce->name, &st) < 0) { |
41174694 | 116 | if (errno != ENOENT && errno != ENOTDIR) { |
0a7668e9 | 117 | perror(ce->name); |
ca2a0798 | 118 | continue; |
57fe64a4 | 119 | } |
d15aa430 | 120 | if (silent) |
0a7668e9 | 121 | continue; |
4a6bf9e1 | 122 | show_file('-', ce); |
e83c5163 LT |
123 | continue; |
124 | } | |
5d728c84 | 125 | changed = ce_match_stat(ce, &st); |
5e76011c | 126 | if (!changed) |
e83c5163 | 127 | continue; |
e2e5e98a | 128 | |
0a7668e9 | 129 | oldmode = ntohl(ce->ce_mode); |
95649d6c JH |
130 | mode = (S_ISLNK(st.st_mode) ? S_IFLNK : |
131 | S_IFREG | ce_permissions(st.st_mode)); | |
0a7668e9 | 132 | |
4a6bf9e1 JH |
133 | show_modified(oldmode, mode, ce->sha1, null_sha1, |
134 | ce->name); | |
e83c5163 | 135 | } |
57fe64a4 | 136 | diff_flush(); |
e83c5163 LT |
137 | return 0; |
138 | } |