🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v1.0.11 / . / diff-files.c
blob: 6c0696c34f0af95acbfe06f644f7df7fb1e93509 [file] [log] [blame]
Linus Torvalds8bc9a0c2005-04-07 22:16:10[diff] [blame]1/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]6#include "cache.h"
Junio C Hamano4a6bf9e2005-04-27 16:21:00[diff] [blame]7#include "diff.h"
Christopher Lic0fb9762005-04-12 09:04:44[diff] [blame]8
Petr Baudis4d1f1192005-07-29 09:01:26[diff] [blame]9static const char diff_files_usage[] =
Linus Torvalds10637b82005-11-30 05:06:10[diff] [blame]10"git-diff-files [-q] [-0/-1/2/3] [<common diff options>] [<path>...]"
Junio C Hamanodda2d792005-07-13 19:52:35[diff] [blame]11COMMON_DIFF_OPTIONS_HELP;
Junio C Hamanob8f80922005-04-17 04:29:45[diff] [blame]12
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]13static struct diff_options diff_options;
Linus Torvalds0a7668e2005-04-27 00:17:36[diff] [blame]14static int silent = 0;
Junio C Hamano15bf57a2005-11-30 10:16:36[diff] [blame]15static int diff_unmerged_stage = 2;
Linus Torvalds0a7668e2005-04-27 00:17:36[diff] [blame]16
Junio C Hamano4a6bf9e2005-04-27 16:21:00[diff] [blame]17static void show_unmerge(const char *path)
Linus Torvalds0a7668e2005-04-27 00:17:36[diff] [blame]18{
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]19 diff_unmerge(&diff_options, path);
Junio C Hamano4a6bf9e2005-04-27 16:21:00[diff] [blame]20}
21
22static void show_file(int pfx, struct cache_entry *ce)
23{
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]24 diff_addremove(&diff_options, pfx, ntohl(ce->ce_mode),
25 ce->sha1, ce->name, NULL);
Junio C Hamano4a6bf9e2005-04-27 16:21:00[diff] [blame]26}
27
28static void show_modified(int oldmode, int mode,
Brian Gerstbf0f9102005-05-18 12:14:09[diff] [blame]29 const unsigned char *old_sha1, const unsigned char *sha1,
Junio C Hamano4a6bf9e2005-04-27 16:21:00[diff] [blame]30 char *path)
31{
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]32 diff_change(&diff_options, oldmode, mode, old_sha1, sha1, path, NULL);
Linus Torvalds0a7668e2005-04-27 00:17:36[diff] [blame]33}
34
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]35int main(int argc, const char **argv)
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]36{
Linus Torvaldsc0fd1f52005-07-14 23:55:06[diff] [blame]37 const char **pathspec;
Linus Torvaldsd288a702005-08-17 01:06:34[diff] [blame]38 const char *prefix = setup_git_directory();
39 int entries, i;
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]40
Junio C Hamano9ce392f2005-11-22 06:52:37[diff] [blame]41 git_config(git_diff_config);
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]42 diff_setup(&diff_options);
Junio C Hamanob8f80922005-04-17 04:29:45[diff] [blame]43 while (1 < argc && argv[1][0] == '-') {
Linus Torvaldsea51d412005-10-18 07:16:45[diff] [blame]44 if (!strcmp(argv[1], "--")) {
45 argv++;
46 argc--;
47 break;
48 }
Linus Torvalds10637b82005-11-30 05:06:10[diff] [blame]49 if (!strcmp(argv[1], "-0"))
50 diff_unmerged_stage = 0;
51 else if (!strcmp(argv[1], "-1"))
52 diff_unmerged_stage = 1;
53 else if (!strcmp(argv[1], "-2"))
54 diff_unmerged_stage = 2;
55 else if (!strcmp(argv[1], "-3"))
56 diff_unmerged_stage = 3;
57 else if (!strcmp(argv[1], "--base"))
58 diff_unmerged_stage = 1;
59 else if (!strcmp(argv[1], "--ours"))
60 diff_unmerged_stage = 2;
61 else if (!strcmp(argv[1], "--theirs"))
62 diff_unmerged_stage = 3;
63 else if (!strcmp(argv[1], "-q"))
Junio C Hamanod15aa432005-04-27 22:22:02[diff] [blame]64 silent = 1;
Linus Torvalds0a7668e2005-04-27 00:17:36[diff] [blame]65 else if (!strcmp(argv[1], "-r"))
Junio C Hamano4a6bf9e2005-04-27 16:21:00[diff] [blame]66 ; /* no-op */
Junio C Hamanod15aa432005-04-27 22:22:02[diff] [blame]67 else if (!strcmp(argv[1], "-s"))
68 ; /* no-op */
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]69 else {
70 int diff_opt_cnt;
71 diff_opt_cnt = diff_opt_parse(&diff_options,
72 argv+1, argc-1);
73 if (diff_opt_cnt < 0)
74 usage(diff_files_usage);
75 else if (diff_opt_cnt) {
76 argv += diff_opt_cnt;
77 argc -= diff_opt_cnt;
78 continue;
79 }
80 else
Junio C Hamano0e3994f2005-06-03 08:37:54[diff] [blame]81 usage(diff_files_usage);
82 }
Junio C Hamanob8f80922005-04-17 04:29:45[diff] [blame]83 argv++; argc--;
Petr Baudise2e5e982005-04-13 08:40:09[diff] [blame]84 }
85
Linus Torvaldsd288a702005-08-17 01:06:34[diff] [blame]86 /* Find the directory, and set up the pathspec */
87 pathspec = get_pathspec(prefix, argv + 1);
88 entries = read_cache();
Linus Torvaldsc0fd1f52005-07-14 23:55:06[diff] [blame]89
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]90 if (diff_setup_done(&diff_options) < 0)
Junio C Hamano4727f642005-06-19 20:14:05[diff] [blame]91 usage(diff_files_usage);
92
Junio C Hamanob8f80922005-04-17 04:29:45[diff] [blame]93 /* At this point, if argc == 1, then we are doing everything.
94 * Otherwise argv[1] .. argv[argc-1] have the explicit paths.
95 */
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]96 if (entries < 0) {
97 perror("read_cache");
98 exit(1);
99 }
Junio C Hamanobe3cfa82005-04-26 16:25:05[diff] [blame]100
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]101 for (i = 0; i < entries; i++) {
102 struct stat st;
Junio C Hamano3e09cdf2005-10-12 01:45:33[diff] [blame]103 unsigned int oldmode, newmode;
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]104 struct cache_entry *ce = active_cache[i];
Junio C Hamanod94c6122005-04-17 04:29:45[diff] [blame]105 int changed;
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]106
Linus Torvaldsc0fd1f52005-07-14 23:55:06[diff] [blame]107 if (!ce_path_match(ce, pathspec))
108 continue;
109
Junio C Hamano9fec8b22005-04-17 04:29:45[diff] [blame]110 if (ce_stage(ce)) {
Junio C Hamano15bf57a2005-11-30 10:16:36[diff] [blame]111 show_unmerge(ce->name);
Linus Torvalds10637b82005-11-30 05:06:10[diff] [blame]112 while (i < entries) {
113 struct cache_entry *nce = active_cache[i];
114
115 if (strcmp(ce->name, nce->name))
116 break;
117 /* diff against the proper unmerged stage */
118 if (ce_stage(nce) == diff_unmerged_stage)
119 ce = nce;
Junio C Hamano9fec8b22005-04-17 04:29:45[diff] [blame]120 i++;
Linus Torvalds10637b82005-11-30 05:06:10[diff] [blame]121 }
122 /*
123 * Compensate for loop update
124 */
125 i--;
126 /*
127 * Show the diff for the 'ce' if we found the one
128 * from the desired stage.
129 */
130 if (ce_stage(ce) != diff_unmerged_stage)
131 continue;
Junio C Hamano9fec8b22005-04-17 04:29:45[diff] [blame]132 }
Junio C Hamano57fe64a2005-05-20 02:00:36[diff] [blame]133
Kay Sieversffbe1ad2005-05-06 13:45:01[diff] [blame]134 if (lstat(ce->name, &st) < 0) {
Junio C Hamano41174692005-05-20 16:48:38[diff] [blame]135 if (errno != ENOENT && errno != ENOTDIR) {
Linus Torvalds0a7668e2005-04-27 00:17:36[diff] [blame]136 perror(ce->name);
Junio C Hamanoca2a0792005-04-15 22:08:09[diff] [blame]137 continue;
Junio C Hamano57fe64a2005-05-20 02:00:36[diff] [blame]138 }
Junio C Hamanod15aa432005-04-27 22:22:02[diff] [blame]139 if (silent)
Linus Torvalds0a7668e2005-04-27 00:17:36[diff] [blame]140 continue;
Junio C Hamano4a6bf9e2005-04-27 16:21:00[diff] [blame]141 show_file('-', ce);
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]142 continue;
143 }
Brad Roberts5d728c82005-05-15 02:04:25[diff] [blame]144 changed = ce_match_stat(ce, &st);
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]145 if (!changed && !diff_options.find_copies_harder)
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]146 continue;
Linus Torvalds0a7668e2005-04-27 00:17:36[diff] [blame]147 oldmode = ntohl(ce->ce_mode);
Junio C Hamano3e09cdf2005-10-12 01:45:33[diff] [blame]148
149 newmode = DIFF_FILE_CANON_MODE(st.st_mode);
150 if (!trust_executable_bit &&
151 S_ISREG(newmode) && S_ISREG(oldmode) &&
152 ((newmode ^ oldmode) == 0111))
153 newmode = oldmode;
154 show_modified(oldmode, newmode,
Junio C Hamano4727f642005-06-19 20:14:05[diff] [blame]155 ce->sha1, (changed ? null_sha1 : ce->sha1),
Junio C Hamano4a6bf9e2005-04-27 16:21:00[diff] [blame]156 ce->name);
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]157 }
Junio C Hamano6b5ee132005-09-21 07:00:47[diff] [blame]158 diffcore_std(&diff_options);
159 diff_flush(&diff_options);
Linus Torvaldse83c5162005-04-07 22:13:13[diff] [blame]160 return 0;
161}