Merge branch 'maint'
[git/debian.git] / builtin-diff-stages.c
blob70bb89808d2296246edbafb8378aa651c3382261
1 /*
2 * Copyright (c) 2005 Junio C Hamano
3 */
5 #include "cache.h"
6 #include "diff.h"
7 #include "builtin.h"
9 static struct diff_options diff_options;
11 static const char diff_stages_usage[] =
12 "git-diff-stages [<common diff options>] <stage1> <stage2> [<path>...]"
13 COMMON_DIFF_OPTIONS_HELP;
15 static void diff_stages(int stage1, int stage2, const char **pathspec)
17 int i = 0;
18 while (i < active_nr) {
19 struct cache_entry *ce, *stages[4] = { NULL, };
20 struct cache_entry *one, *two;
21 const char *name;
22 int len, skip;
24 ce = active_cache[i];
25 skip = !ce_path_match(ce, pathspec);
26 len = ce_namelen(ce);
27 name = ce->name;
28 for (;;) {
29 int stage = ce_stage(ce);
30 stages[stage] = ce;
31 if (active_nr <= ++i)
32 break;
33 ce = active_cache[i];
34 if (ce_namelen(ce) != len ||
35 memcmp(name, ce->name, len))
36 break;
38 one = stages[stage1];
39 two = stages[stage2];
41 if (skip || (!one && !two))
42 continue;
43 if (!one)
44 diff_addremove(&diff_options, '+', ntohl(two->ce_mode),
45 two->sha1, name, NULL);
46 else if (!two)
47 diff_addremove(&diff_options, '-', ntohl(one->ce_mode),
48 one->sha1, name, NULL);
49 else if (hashcmp(one->sha1, two->sha1) ||
50 (one->ce_mode != two->ce_mode) ||
51 diff_options.find_copies_harder)
52 diff_change(&diff_options,
53 ntohl(one->ce_mode), ntohl(two->ce_mode),
54 one->sha1, two->sha1, name, NULL);
58 int cmd_diff_stages(int ac, const char **av, const char *prefix)
60 int stage1, stage2;
61 const char **pathspec = NULL;
63 git_config(git_default_config); /* no "diff" UI options */
64 read_cache();
65 diff_setup(&diff_options);
66 while (1 < ac && av[1][0] == '-') {
67 const char *arg = av[1];
68 if (!strcmp(arg, "-r"))
69 ; /* as usual */
70 else {
71 int diff_opt_cnt;
72 diff_opt_cnt = diff_opt_parse(&diff_options,
73 av+1, ac-1);
74 if (diff_opt_cnt < 0)
75 usage(diff_stages_usage);
76 else if (diff_opt_cnt) {
77 av += diff_opt_cnt;
78 ac -= diff_opt_cnt;
79 continue;
81 else
82 usage(diff_stages_usage);
84 ac--; av++;
87 if (!diff_options.output_format)
88 diff_options.output_format = DIFF_FORMAT_RAW;
90 if (ac < 3 ||
91 sscanf(av[1], "%d", &stage1) != 1 ||
92 ! (0 <= stage1 && stage1 <= 3) ||
93 sscanf(av[2], "%d", &stage2) != 1 ||
94 ! (0 <= stage2 && stage2 <= 3))
95 usage(diff_stages_usage);
97 av += 3; /* The rest from av[0] are for paths restriction. */
98 pathspec = get_pathspec(prefix, av);
100 if (diff_setup_done(&diff_options) < 0)
101 usage(diff_stages_usage);
103 diff_stages(stage1, stage2, pathspec);
104 diffcore_std(&diff_options);
105 diff_flush(&diff_options);
106 return 0;