Fix overzealous cleanliness check in git-merge
[git/jnareb-git.git] / rev-parse.c
blob507b531dce781133946da04cb27fa2ff6d3832a9
1 /*
2 * rev-parse.c
4 * Copyright (C) Linus Torvalds, 2005
5 */
6 #include "cache.h"
7 #include "commit.h"
8 #include "refs.h"
9 #include "quote.h"
11 #define DO_REVS 1
12 #define DO_NOREV 2
13 #define DO_FLAGS 4
14 #define DO_NONFLAGS 8
15 static int filter = ~0;
17 static char *def = NULL;
19 #define NORMAL 0
20 #define REVERSED 1
21 static int show_type = NORMAL;
22 static int symbolic = 0;
23 static int output_sq = 0;
25 static int revs_count = 0;
28 * Some arguments are relevant "revision" arguments,
29 * others are about output format or other details.
30 * This sorts it all out.
32 static int is_rev_argument(const char *arg)
34 static const char *rev_args[] = {
35 "--bisect",
36 "--header",
37 "--max-age=",
38 "--max-count=",
39 "--merge-order",
40 "--min-age=",
41 "--no-merges",
42 "--objects",
43 "--parents",
44 "--pretty",
45 "--show-breaks",
46 "--topo-order",
47 "--unpacked",
48 NULL
50 const char **p = rev_args;
52 for (;;) {
53 const char *str = *p++;
54 int len;
55 if (!str)
56 return 0;
57 len = strlen(str);
58 if (!strcmp(arg, str) ||
59 (str[len-1] == '=' && !strncmp(arg, str, len)))
60 return 1;
64 /* Output argument as a string, either SQ or normal */
65 static void show(const char *arg)
67 if (output_sq) {
68 int sq = '\'', ch;
70 putchar(sq);
71 while ((ch = *arg++)) {
72 if (ch == sq)
73 fputs("'\\'", stdout);
74 putchar(ch);
76 putchar(sq);
77 putchar(' ');
79 else
80 puts(arg);
83 /* Output a revision, only if filter allows it */
84 static void show_rev(int type, const unsigned char *sha1, const char *name)
86 if (!(filter & DO_REVS))
87 return;
88 def = NULL;
89 revs_count++;
91 if (type != show_type)
92 putchar('^');
93 if (symbolic && name)
94 show(name);
95 else
96 show(sha1_to_hex(sha1));
99 /* Output a flag, only if filter allows it. */
100 static void show_flag(char *arg)
102 if (!(filter & DO_FLAGS))
103 return;
104 if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV))
105 show(arg);
108 static void show_default(void)
110 char *s = def;
112 if (s) {
113 unsigned char sha1[20];
115 def = NULL;
116 if (!get_sha1(s, sha1)) {
117 show_rev(NORMAL, sha1, s);
118 return;
123 static int show_reference(const char *refname, const unsigned char *sha1)
125 show_rev(NORMAL, sha1, refname);
126 return 0;
129 static void show_datestring(const char *flag, const char *datestr)
131 FILE *date;
132 static char buffer[100];
133 static char cmd[1000];
134 int len;
136 /* date handling requires both flags and revs */
137 if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS))
138 return;
139 len = strlen(flag);
140 memcpy(buffer, flag, len);
142 snprintf(cmd, sizeof(cmd), "date --date=%s +%%s", sq_quote(datestr));
143 date = popen(cmd, "r");
144 if (!date || !fgets(buffer + len, sizeof(buffer) - len, date))
145 die("git-rev-list: bad date string");
146 pclose(date);
147 len = strlen(buffer);
148 if (buffer[len-1] == '\n')
149 buffer[--len] = 0;
150 show(buffer);
153 int main(int argc, char **argv)
155 int i, as_is = 0, verify = 0;
156 unsigned char sha1[20];
157 const char *prefix = setup_git_directory();
159 for (i = 1; i < argc; i++) {
160 char *arg = argv[i];
161 char *dotdot;
163 if (as_is) {
164 show(arg);
165 continue;
167 if (*arg == '-') {
168 if (!strcmp(arg, "--")) {
169 as_is = 1;
170 continue;
172 if (!strcmp(arg, "--default")) {
173 def = argv[i+1];
174 i++;
175 continue;
177 if (!strcmp(arg, "--revs-only")) {
178 filter &= ~DO_NOREV;
179 continue;
181 if (!strcmp(arg, "--no-revs")) {
182 filter &= ~DO_REVS;
183 continue;
185 if (!strcmp(arg, "--flags")) {
186 filter &= ~DO_NONFLAGS;
187 continue;
189 if (!strcmp(arg, "--no-flags")) {
190 filter &= ~DO_FLAGS;
191 continue;
193 if (!strcmp(arg, "--verify")) {
194 filter &= ~(DO_FLAGS|DO_NOREV);
195 verify = 1;
196 continue;
198 if (!strcmp(arg, "--sq")) {
199 output_sq = 1;
200 continue;
202 if (!strcmp(arg, "--not")) {
203 show_type ^= REVERSED;
204 continue;
206 if (!strcmp(arg, "--symbolic")) {
207 symbolic = 1;
208 continue;
210 if (!strcmp(arg, "--all")) {
211 for_each_ref(show_reference);
212 continue;
214 if (!strcmp(arg, "--show-prefix")) {
215 if (prefix)
216 puts(prefix);
217 continue;
219 if (!strcmp(arg, "--git-dir")) {
220 const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
221 static char cwd[PATH_MAX];
222 if (gitdir) {
223 puts(gitdir);
224 continue;
226 if (!prefix) {
227 puts(".git");
228 continue;
230 if (!getcwd(cwd, PATH_MAX))
231 die("unable to get current working directory");
232 printf("%s/.git\n", cwd);
233 continue;
235 if (!strncmp(arg, "--since=", 8)) {
236 show_datestring("--max-age=", arg+8);
237 continue;
239 if (!strncmp(arg, "--after=", 8)) {
240 show_datestring("--max-age=", arg+8);
241 continue;
243 if (!strncmp(arg, "--before=", 9)) {
244 show_datestring("--min-age=", arg+9);
245 continue;
247 if (!strncmp(arg, "--until=", 8)) {
248 show_datestring("--min-age=", arg+8);
249 continue;
251 if (verify)
252 die("Needed a single revision");
253 show_flag(arg);
254 continue;
257 /* Not a flag argument */
258 dotdot = strstr(arg, "..");
259 if (dotdot) {
260 unsigned char end[20];
261 char *n = dotdot+2;
262 *dotdot = 0;
263 if (!get_sha1(arg, sha1)) {
264 if (!*n)
265 n = "HEAD";
266 if (!get_sha1(n, end)) {
267 show_rev(NORMAL, end, n);
268 show_rev(REVERSED, sha1, arg);
269 continue;
272 *dotdot = '.';
274 if (!get_sha1(arg, sha1)) {
275 show_rev(NORMAL, sha1, arg);
276 continue;
278 if (*arg == '^' && !get_sha1(arg+1, sha1)) {
279 show_rev(REVERSED, sha1, arg+1);
280 continue;
282 if (verify)
283 die("Needed a single revision");
284 if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
285 (DO_NONFLAGS|DO_NOREV))
286 show(arg);
288 show_default();
289 if (verify && revs_count != 1)
290 die("Needed a single revision");
291 return 0;