Merge branch 'maint'
[git] / builtin-revert.c
1 #include "cache.h"
2 #include "builtin.h"
3 #include "object.h"
4 #include "commit.h"
5 #include "tag.h"
6 #include "wt-status.h"
7 #include "run-command.h"
8 #include "exec_cmd.h"
9 #include "utf8.h"
10 #include "parse-options.h"
11
12 /*
13  * This implements the builtins revert and cherry-pick.
14  *
15  * Copyright (c) 2007 Johannes E. Schindelin
16  *
17  * Based on git-revert.sh, which is
18  *
19  * Copyright (c) 2005 Linus Torvalds
20  * Copyright (c) 2005 Junio C Hamano
21  */
22
23 static const char * const revert_usage[] = {
24         "git-revert [options] <commit-ish>",
25         NULL
26 };
27
28 static const char * const cherry_pick_usage[] = {
29         "git-cherry-pick [options] <commit-ish>",
30         NULL
31 };
32
33 static int edit, no_replay, no_commit, needed_deref, mainline;
34 static enum { REVERT, CHERRY_PICK } action;
35 static struct commit *commit;
36
37 static const char *me;
38
39 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
40
41 static void parse_args(int argc, const char **argv)
42 {
43         const char * const * usage_str =
44                 action == REVERT ?  revert_usage : cherry_pick_usage;
45         unsigned char sha1[20];
46         const char *arg;
47         int noop;
48         struct option options[] = {
49                 OPT_BOOLEAN('n', "no-commit", &no_commit, "don't automatically commit"),
50                 OPT_BOOLEAN('e', "edit", &edit, "edit the commit message"),
51                 OPT_BOOLEAN('x', NULL, &no_replay, "append commit name when cherry-picking"),
52                 OPT_BOOLEAN('r', NULL, &noop, "no-op (backward compatibility)"),
53                 OPT_INTEGER('m', "mainline", &mainline, "parent number"),
54                 OPT_END(),
55         };
56
57         if (parse_options(argc, argv, options, usage_str, 0) != 1)
58                 usage_with_options(usage_str, options);
59         arg = argv[0];
60
61         if (get_sha1(arg, sha1))
62                 die ("Cannot find '%s'", arg);
63         commit = (struct commit *)parse_object(sha1);
64         if (!commit)
65                 die ("Could not find %s", sha1_to_hex(sha1));
66         if (commit->object.type == OBJ_TAG) {
67                 commit = (struct commit *)
68                         deref_tag((struct object *)commit, arg, strlen(arg));
69                 needed_deref = 1;
70         }
71         if (commit->object.type != OBJ_COMMIT)
72                 die ("'%s' does not point to a commit", arg);
73 }
74
75 static char *get_oneline(const char *message)
76 {
77         char *result;
78         const char *p = message, *abbrev, *eol;
79         int abbrev_len, oneline_len;
80
81         if (!p)
82                 die ("Could not read commit message of %s",
83                                 sha1_to_hex(commit->object.sha1));
84         while (*p && (*p != '\n' || p[1] != '\n'))
85                 p++;
86
87         if (*p) {
88                 p += 2;
89                 for (eol = p + 1; *eol && *eol != '\n'; eol++)
90                         ; /* do nothing */
91         } else
92                 eol = p;
93         abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV);
94         abbrev_len = strlen(abbrev);
95         oneline_len = eol - p;
96         result = xmalloc(abbrev_len + 5 + oneline_len);
97         memcpy(result, abbrev, abbrev_len);
98         memcpy(result + abbrev_len, "... ", 4);
99         memcpy(result + abbrev_len + 4, p, oneline_len);
100         result[abbrev_len + 4 + oneline_len] = '\0';
101         return result;
102 }
103
104 static char *get_encoding(const char *message)
105 {
106         const char *p = message, *eol;
107
108         if (!p)
109                 die ("Could not read commit message of %s",
110                                 sha1_to_hex(commit->object.sha1));
111         while (*p && *p != '\n') {
112                 for (eol = p + 1; *eol && *eol != '\n'; eol++)
113                         ; /* do nothing */
114                 if (!prefixcmp(p, "encoding ")) {
115                         char *result = xmalloc(eol - 8 - p);
116                         strlcpy(result, p + 9, eol - 8 - p);
117                         return result;
118                 }
119                 p = eol;
120                 if (*p == '\n')
121                         p++;
122         }
123         return NULL;
124 }
125
126 static struct lock_file msg_file;
127 static int msg_fd;
128
129 static void add_to_msg(const char *string)
130 {
131         int len = strlen(string);
132         if (write_in_full(msg_fd, string, len) < 0)
133                 die ("Could not write to MERGE_MSG");
134 }
135
136 static void add_message_to_msg(const char *message)
137 {
138         const char *p = message;
139         while (*p && (*p != '\n' || p[1] != '\n'))
140                 p++;
141
142         if (!*p)
143                 add_to_msg(sha1_to_hex(commit->object.sha1));
144
145         p += 2;
146         add_to_msg(p);
147         return;
148 }
149
150 static void set_author_ident_env(const char *message)
151 {
152         const char *p = message;
153         if (!p)
154                 die ("Could not read commit message of %s",
155                                 sha1_to_hex(commit->object.sha1));
156         while (*p && *p != '\n') {
157                 const char *eol;
158
159                 for (eol = p; *eol && *eol != '\n'; eol++)
160                         ; /* do nothing */
161                 if (!prefixcmp(p, "author ")) {
162                         char *line, *pend, *email, *timestamp;
163
164                         p += 7;
165                         line = xmemdupz(p, eol - p);
166                         email = strchr(line, '<');
167                         if (!email)
168                                 die ("Could not extract author email from %s",
169                                         sha1_to_hex(commit->object.sha1));
170                         if (email == line)
171                                 pend = line;
172                         else
173                                 for (pend = email; pend != line + 1 &&
174                                                 isspace(pend[-1]); pend--);
175                                         ; /* do nothing */
176                         *pend = '\0';
177                         email++;
178                         timestamp = strchr(email, '>');
179                         if (!timestamp)
180                                 die ("Could not extract author email from %s",
181                                         sha1_to_hex(commit->object.sha1));
182                         *timestamp = '\0';
183                         for (timestamp++; *timestamp && isspace(*timestamp);
184                                         timestamp++)
185                                 ; /* do nothing */
186                         setenv("GIT_AUTHOR_NAME", line, 1);
187                         setenv("GIT_AUTHOR_EMAIL", email, 1);
188                         setenv("GIT_AUTHOR_DATE", timestamp, 1);
189                         free(line);
190                         return;
191                 }
192                 p = eol;
193                 if (*p == '\n')
194                         p++;
195         }
196         die ("No author information found in %s",
197                         sha1_to_hex(commit->object.sha1));
198 }
199
200 static int merge_recursive(const char *base_sha1,
201                 const char *head_sha1, const char *head_name,
202                 const char *next_sha1, const char *next_name)
203 {
204         char buffer[256];
205         const char *argv[6];
206
207         sprintf(buffer, "GITHEAD_%s", head_sha1);
208         setenv(buffer, head_name, 1);
209         sprintf(buffer, "GITHEAD_%s", next_sha1);
210         setenv(buffer, next_name, 1);
211
212         /*
213          * This three way merge is an interesting one.  We are at
214          * $head, and would want to apply the change between $commit
215          * and $prev on top of us (when reverting), or the change between
216          * $prev and $commit on top of us (when cherry-picking or replaying).
217          */
218         argv[0] = "merge-recursive";
219         argv[1] = base_sha1;
220         argv[2] = "--";
221         argv[3] = head_sha1;
222         argv[4] = next_sha1;
223         argv[5] = NULL;
224
225         return run_command_v_opt(argv, RUN_COMMAND_NO_STDIN | RUN_GIT_CMD);
226 }
227
228 static int revert_or_cherry_pick(int argc, const char **argv)
229 {
230         unsigned char head[20];
231         struct commit *base, *next, *parent;
232         int i;
233         char *oneline, *reencoded_message = NULL;
234         const char *message, *encoding;
235         const char *defmsg = xstrdup(git_path("MERGE_MSG"));
236
237         git_config(git_default_config);
238         me = action == REVERT ? "revert" : "cherry-pick";
239         setenv(GIT_REFLOG_ACTION, me, 0);
240         parse_args(argc, argv);
241
242         /* this is copied from the shell script, but it's never triggered... */
243         if (action == REVERT && !no_replay)
244                 die("revert is incompatible with replay");
245
246         if (no_commit) {
247                 /*
248                  * We do not intend to commit immediately.  We just want to
249                  * merge the differences in.
250                  */
251                 if (write_tree(head, 0, NULL))
252                         die ("Your index file is unmerged.");
253         } else {
254                 struct wt_status s;
255
256                 if (get_sha1("HEAD", head))
257                         die ("You do not have a valid HEAD");
258                 wt_status_prepare(&s);
259                 if (s.commitable || s.workdir_dirty)
260                         die ("Dirty index: cannot %s", me);
261                 discard_cache();
262         }
263
264         if (!commit->parents)
265                 die ("Cannot %s a root commit", me);
266         if (commit->parents->next) {
267                 /* Reverting or cherry-picking a merge commit */
268                 int cnt;
269                 struct commit_list *p;
270
271                 if (!mainline)
272                         die("Commit %s is a merge but no -m option was given.",
273                             sha1_to_hex(commit->object.sha1));
274
275                 for (cnt = 1, p = commit->parents;
276                      cnt != mainline && p;
277                      cnt++)
278                         p = p->next;
279                 if (cnt != mainline || !p)
280                         die("Commit %s does not have parent %d",
281                             sha1_to_hex(commit->object.sha1), mainline);
282                 parent = p->item;
283         } else if (0 < mainline)
284                 die("Mainline was specified but commit %s is not a merge.",
285                     sha1_to_hex(commit->object.sha1));
286         else
287                 parent = commit->parents->item;
288
289         if (!(message = commit->buffer))
290                 die ("Cannot get commit message for %s",
291                                 sha1_to_hex(commit->object.sha1));
292
293         /*
294          * "commit" is an existing commit.  We would want to apply
295          * the difference it introduces since its first parent "prev"
296          * on top of the current HEAD if we are cherry-pick.  Or the
297          * reverse of it if we are revert.
298          */
299
300         msg_fd = hold_lock_file_for_update(&msg_file, defmsg, 1);
301
302         encoding = get_encoding(message);
303         if (!encoding)
304                 encoding = "utf-8";
305         if (!git_commit_encoding)
306                 git_commit_encoding = "utf-8";
307         if ((reencoded_message = reencode_string(message,
308                                         git_commit_encoding, encoding)))
309                 message = reencoded_message;
310
311         oneline = get_oneline(message);
312
313         if (action == REVERT) {
314                 char *oneline_body = strchr(oneline, ' ');
315
316                 base = commit;
317                 next = parent;
318                 add_to_msg("Revert \"");
319                 add_to_msg(oneline_body + 1);
320                 add_to_msg("\"\n\nThis reverts commit ");
321                 add_to_msg(sha1_to_hex(commit->object.sha1));
322                 add_to_msg(".\n");
323         } else {
324                 base = parent;
325                 next = commit;
326                 set_author_ident_env(message);
327                 add_message_to_msg(message);
328                 if (no_replay) {
329                         add_to_msg("(cherry picked from commit ");
330                         add_to_msg(sha1_to_hex(commit->object.sha1));
331                         add_to_msg(")\n");
332                 }
333         }
334         if (needed_deref) {
335                 add_to_msg("(original 'git ");
336                 add_to_msg(me);
337                 add_to_msg("' arguments: ");
338                 for (i = 0; i < argc; i++) {
339                         if (i)
340                                 add_to_msg(" ");
341                         add_to_msg(argv[i]);
342                 }
343                 add_to_msg(")\n");
344         }
345
346         if (merge_recursive(sha1_to_hex(base->object.sha1),
347                                 sha1_to_hex(head), "HEAD",
348                                 sha1_to_hex(next->object.sha1), oneline) ||
349                         write_tree(head, 0, NULL)) {
350                 add_to_msg("\nConflicts:\n\n");
351                 read_cache();
352                 for (i = 0; i < active_nr;) {
353                         struct cache_entry *ce = active_cache[i++];
354                         if (ce_stage(ce)) {
355                                 add_to_msg("\t");
356                                 add_to_msg(ce->name);
357                                 add_to_msg("\n");
358                                 while (i < active_nr && !strcmp(ce->name,
359                                                 active_cache[i]->name))
360                                         i++;
361                         }
362                 }
363                 if (close(msg_fd) || commit_lock_file(&msg_file) < 0)
364                         die ("Error wrapping up %s", defmsg);
365                 fprintf(stderr, "Automatic %s failed.  "
366                         "After resolving the conflicts,\n"
367                         "mark the corrected paths with 'git add <paths>' "
368                         "and commit the result.\n", me);
369                 if (action == CHERRY_PICK) {
370                         fprintf(stderr, "When commiting, use the option "
371                                 "'-c %s' to retain authorship and message.\n",
372                                 find_unique_abbrev(commit->object.sha1,
373                                         DEFAULT_ABBREV));
374                 }
375                 exit(1);
376         }
377         if (close(msg_fd) || commit_lock_file(&msg_file) < 0)
378                 die ("Error wrapping up %s", defmsg);
379         fprintf(stderr, "Finished one %s.\n", me);
380
381         /*
382          *
383          * If we are cherry-pick, and if the merge did not result in
384          * hand-editing, we will hit this commit and inherit the original
385          * author date and name.
386          * If we are revert, or if our cherry-pick results in a hand merge,
387          * we had better say that the current user is responsible for that.
388          */
389
390         if (!no_commit) {
391                 if (edit)
392                         return execl_git_cmd("commit", "-n", NULL);
393                 else
394                         return execl_git_cmd("commit", "-n", "-F", defmsg, NULL);
395         }
396         if (reencoded_message)
397                 free(reencoded_message);
398
399         return 0;
400 }
401
402 int cmd_revert(int argc, const char **argv, const char *prefix)
403 {
404         if (isatty(0))
405                 edit = 1;
406         no_replay = 1;
407         action = REVERT;
408         return revert_or_cherry_pick(argc, argv);
409 }
410
411 int cmd_cherry_pick(int argc, const char **argv, const char *prefix)
412 {
413         no_replay = 0;
414         action = CHERRY_PICK;
415         return revert_or_cherry_pick(argc, argv);
416 }