]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/difftool.c
hashmap_get{,_from_hash} return "struct hashmap_entry *"
[thirdparty/git.git] / builtin / difftool.c
CommitLineData
be8a90e5
JS
1/*
2 * "git difftool" builtin command
3 *
4 * This is a wrapper around the GIT_EXTERNAL_DIFF-compatible
5 * git-difftool--helper script.
6 *
7 * This script exports GIT_EXTERNAL_DIFF and GIT_PAGER for use by git.
8 * The GIT_DIFF* variables are exported for use by git-difftool--helper.
9 *
10 * Any arguments that are unknown to this script are forwarded to 'git diff'.
11 *
12 * Copyright (C) 2016 Johannes Schindelin
13 */
f8adbec9 14#define USE_THE_INDEX_COMPATIBILITY_MACROS
03831ef7 15#include "cache.h"
b2141fc1 16#include "config.h"
be8a90e5
JS
17#include "builtin.h"
18#include "run-command.h"
d807c4a0 19#include "exec-cmd.h"
03831ef7
JS
20#include "parse-options.h"
21#include "argv-array.h"
22#include "strbuf.h"
23#include "lockfile.h"
cbd53a21 24#include "object-store.h"
03831ef7
JS
25#include "dir.h"
26
03831ef7
JS
27static int trust_exit_code;
28
29static const char *const builtin_difftool_usage[] = {
30 N_("git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"),
31 NULL
32};
33
34static int difftool_config(const char *var, const char *value, void *cb)
35{
03831ef7
JS
36 if (!strcmp(var, "difftool.trustexitcode")) {
37 trust_exit_code = git_config_bool(var, value);
38 return 0;
39 }
40
41 return git_default_config(var, value, cb);
42}
43
44static int print_tool_help(void)
45{
46 const char *argv[] = { "mergetool", "--tool-help=diff", NULL };
47 return run_command_v_opt(argv, RUN_GIT_CMD);
48}
49
50static int parse_index_info(char *p, int *mode1, int *mode2,
51 struct object_id *oid1, struct object_id *oid2,
52 char *status)
53{
54 if (*p != ':')
55 return error("expected ':', got '%c'", *p);
56 *mode1 = (int)strtol(p + 1, &p, 8);
57 if (*p != ' ')
58 return error("expected ' ', got '%c'", *p);
59 *mode2 = (int)strtol(p + 1, &p, 8);
60 if (*p != ' ')
61 return error("expected ' ', got '%c'", *p);
ebe4df59 62 if (parse_oid_hex(++p, oid1, (const char **)&p))
63 return error("expected object ID, got '%s'", p);
03831ef7
JS
64 if (*p != ' ')
65 return error("expected ' ', got '%c'", *p);
ebe4df59 66 if (parse_oid_hex(++p, oid2, (const char **)&p))
67 return error("expected object ID, got '%s'", p);
03831ef7
JS
68 if (*p != ' ')
69 return error("expected ' ', got '%c'", *p);
70 *status = *++p;
71 if (!*status)
72 return error("missing status");
73 if (p[1] && !isdigit(p[1]))
74 return error("unexpected trailer: '%s'", p + 1);
75 return 0;
76}
77
78/*
79 * Remove any trailing slash from $workdir
80 * before starting to avoid double slashes in symlink targets.
81 */
82static void add_path(struct strbuf *buf, size_t base_len, const char *path)
83{
84 strbuf_setlen(buf, base_len);
85 if (buf->len && buf->buf[buf->len - 1] != '/')
86 strbuf_addch(buf, '/');
87 strbuf_addstr(buf, path);
88}
89
90/*
91 * Determine whether we can simply reuse the file in the worktree.
92 */
93static int use_wt_file(const char *workdir, const char *name,
94 struct object_id *oid)
95{
96 struct strbuf buf = STRBUF_INIT;
97 struct stat st;
98 int use = 0;
99
100 strbuf_addstr(&buf, workdir);
101 add_path(&buf, buf.len, name);
102
103 if (!lstat(buf.buf, &st) && !S_ISLNK(st.st_mode)) {
104 struct object_id wt_oid;
105 int fd = open(buf.buf, O_RDONLY);
106
107 if (fd >= 0 &&
58bf2a4c 108 !index_fd(&the_index, &wt_oid, fd, &st, OBJ_BLOB, name, 0)) {
03831ef7
JS
109 if (is_null_oid(oid)) {
110 oidcpy(oid, &wt_oid);
111 use = 1;
4a7e27e9 112 } else if (oideq(oid, &wt_oid))
03831ef7
JS
113 use = 1;
114 }
115 }
116
117 strbuf_release(&buf);
118
119 return use;
120}
121
122struct working_tree_entry {
123 struct hashmap_entry entry;
124 char path[FLEX_ARRAY];
125};
126
7663cdc8 127static int working_tree_entry_cmp(const void *unused_cmp_data,
7db316bc
SB
128 const void *entry,
129 const void *entry_or_key,
130 const void *unused_keydata)
03831ef7 131{
7db316bc
SB
132 const struct working_tree_entry *a = entry;
133 const struct working_tree_entry *b = entry_or_key;
03831ef7
JS
134 return strcmp(a->path, b->path);
135}
136
137/*
138 * The `left` and `right` entries hold paths for the symlinks hashmap,
139 * and a SHA-1 surrounded by brief text for submodules.
140 */
141struct pair_entry {
142 struct hashmap_entry entry;
143 char left[PATH_MAX], right[PATH_MAX];
144 const char path[FLEX_ARRAY];
145};
146
7663cdc8 147static int pair_cmp(const void *unused_cmp_data,
7db316bc
SB
148 const void *entry,
149 const void *entry_or_key,
150 const void *unused_keydata)
03831ef7 151{
7db316bc
SB
152 const struct pair_entry *a = entry;
153 const struct pair_entry *b = entry_or_key;
154
03831ef7
JS
155 return strcmp(a->path, b->path);
156}
157
158static void add_left_or_right(struct hashmap *map, const char *path,
159 const char *content, int is_right)
160{
161 struct pair_entry *e, *existing;
162
163 FLEX_ALLOC_STR(e, path, path);
d22245a2 164 hashmap_entry_init(&e->entry, strhash(path));
f23a4651 165 existing = hashmap_get_entry(map, e, NULL, struct pair_entry, entry);
03831ef7
JS
166 if (existing) {
167 free(e);
168 e = existing;
169 } else {
170 e->left[0] = e->right[0] = '\0';
b94e5c1d 171 hashmap_add(map, &e->entry);
03831ef7
JS
172 }
173 strlcpy(is_right ? e->right : e->left, content, PATH_MAX);
174}
175
176struct path_entry {
177 struct hashmap_entry entry;
178 char path[FLEX_ARRAY];
179};
180
7663cdc8 181static int path_entry_cmp(const void *unused_cmp_data,
7db316bc
SB
182 const void *entry,
183 const void *entry_or_key,
184 const void *key)
03831ef7 185{
7db316bc
SB
186 const struct path_entry *a = entry;
187 const struct path_entry *b = entry_or_key;
188
03831ef7
JS
189 return strcmp(a->path, key ? key : b->path);
190}
191
192static void changed_files(struct hashmap *result, const char *index_path,
193 const char *workdir)
194{
195 struct child_process update_index = CHILD_PROCESS_INIT;
196 struct child_process diff_files = CHILD_PROCESS_INIT;
197 struct strbuf index_env = STRBUF_INIT, buf = STRBUF_INIT;
198 const char *git_dir = absolute_path(get_git_dir()), *env[] = {
199 NULL, NULL
200 };
201 FILE *fp;
202
203 strbuf_addf(&index_env, "GIT_INDEX_FILE=%s", index_path);
204 env[0] = index_env.buf;
205
206 argv_array_pushl(&update_index.args,
207 "--git-dir", git_dir, "--work-tree", workdir,
208 "update-index", "--really-refresh", "-q",
209 "--unmerged", NULL);
210 update_index.no_stdin = 1;
211 update_index.no_stdout = 1;
212 update_index.no_stderr = 1;
213 update_index.git_cmd = 1;
214 update_index.use_shell = 0;
215 update_index.clean_on_exit = 1;
216 update_index.dir = workdir;
217 update_index.env = env;
218 /* Ignore any errors of update-index */
219 run_command(&update_index);
220
221 argv_array_pushl(&diff_files.args,
222 "--git-dir", git_dir, "--work-tree", workdir,
223 "diff-files", "--name-only", "-z", NULL);
224 diff_files.no_stdin = 1;
225 diff_files.git_cmd = 1;
226 diff_files.use_shell = 0;
227 diff_files.clean_on_exit = 1;
228 diff_files.out = -1;
229 diff_files.dir = workdir;
230 diff_files.env = env;
231 if (start_command(&diff_files))
232 die("could not obtain raw diff");
233 fp = xfdopen(diff_files.out, "r");
234 while (!strbuf_getline_nul(&buf, fp)) {
235 struct path_entry *entry;
236 FLEX_ALLOC_STR(entry, path, buf.buf);
d22245a2 237 hashmap_entry_init(&entry->entry, strhash(buf.buf));
b94e5c1d 238 hashmap_add(result, &entry->entry);
03831ef7 239 }
5f3296c0 240 fclose(fp);
03831ef7
JS
241 if (finish_command(&diff_files))
242 die("diff-files did not exit properly");
243 strbuf_release(&index_env);
244 strbuf_release(&buf);
245}
246
247static NORETURN void exit_cleanup(const char *tmpdir, int exit_code)
248{
249 struct strbuf buf = STRBUF_INIT;
250 strbuf_addstr(&buf, tmpdir);
251 remove_dir_recursively(&buf, 0);
252 if (exit_code)
253 warning(_("failed: %d"), exit_code);
254 exit(exit_code);
255}
256
257static int ensure_leading_directories(char *path)
258{
259 switch (safe_create_leading_directories(path)) {
260 case SCLD_OK:
261 case SCLD_EXISTS:
262 return 0;
263 default:
264 return error(_("could not create leading directories "
265 "of '%s'"), path);
266 }
267}
268
18ec8005
DA
269/*
270 * Unconditional writing of a plain regular file is what
271 * "git difftool --dir-diff" wants to do for symlinks. We are preparing two
272 * temporary directories to be fed to a Git-unaware tool that knows how to
273 * show a diff of two directories (e.g. "diff -r A B").
274 *
275 * Because the tool is Git-unaware, if a symbolic link appears in either of
276 * these temporary directories, it will try to dereference and show the
277 * difference of the target of the symbolic link, which is not what we want,
278 * as the goal of the dir-diff mode is to produce an output that is logically
279 * equivalent to what "git diff" produces.
280 *
281 * Most importantly, we want to get textual comparison of the result of the
282 * readlink(2). get_symlink() provides that---it returns the contents of
283 * the symlink that gets written to a regular file to force the external tool
284 * to compare the readlink(2) result as text, even on a filesystem that is
285 * capable of doing a symbolic link.
286 */
287static char *get_symlink(const struct object_id *oid, const char *path)
288{
289 char *data;
290 if (is_null_oid(oid)) {
291 /* The symlink is unknown to Git so read from the filesystem */
292 struct strbuf link = STRBUF_INIT;
293 if (has_symlinks) {
294 if (strbuf_readlink(&link, path, strlen(path)))
295 die(_("could not read symlink %s"), path);
296 } else if (strbuf_read_file(&link, path, 128))
297 die(_("could not read symlink file %s"), path);
298
299 data = strbuf_detach(&link, NULL);
300 } else {
301 enum object_type type;
302 unsigned long size;
b4f5aca4 303 data = read_object_file(oid, &type, &size);
18ec8005
DA
304 if (!data)
305 die(_("could not read object %s for symlink %s"),
306 oid_to_hex(oid), path);
307 }
308
309 return data;
310}
311
0730dd4f
JK
312static int checkout_path(unsigned mode, struct object_id *oid,
313 const char *path, const struct checkout *state)
314{
315 struct cache_entry *ce;
316 int ret;
317
a849735b 318 ce = make_transient_cache_entry(mode, oid, path, 0);
0f086e6d 319 ret = checkout_entry(ce, state, NULL, NULL);
0730dd4f 320
a849735b 321 discard_cache_entry(ce);
0730dd4f
JK
322 return ret;
323}
324
03831ef7
JS
325static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
326 int argc, const char **argv)
327{
328 char tmpdir[PATH_MAX];
329 struct strbuf info = STRBUF_INIT, lpath = STRBUF_INIT;
330 struct strbuf rpath = STRBUF_INIT, buf = STRBUF_INIT;
331 struct strbuf ldir = STRBUF_INIT, rdir = STRBUF_INIT;
332 struct strbuf wtdir = STRBUF_INIT;
882add13 333 char *lbase_dir, *rbase_dir;
03831ef7 334 size_t ldir_len, rdir_len, wtdir_len;
03831ef7
JS
335 const char *workdir, *tmp;
336 int ret = 0, i;
337 FILE *fp;
338 struct hashmap working_tree_dups, submodules, symlinks2;
339 struct hashmap_iter iter;
340 struct pair_entry *entry;
03831ef7
JS
341 struct index_state wtindex;
342 struct checkout lstate, rstate;
343 int rc, flags = RUN_GIT_CMD, err = 0;
344 struct child_process child = CHILD_PROCESS_INIT;
345 const char *helper_argv[] = { "difftool--helper", NULL, NULL, NULL };
346 struct hashmap wt_modified, tmp_modified;
347 int indices_loaded = 0;
348
349 workdir = get_git_work_tree();
350
351 /* Setup temp directories */
352 tmp = getenv("TMPDIR");
353 xsnprintf(tmpdir, sizeof(tmpdir), "%s/git-difftool.XXXXXX", tmp ? tmp : "/tmp");
354 if (!mkdtemp(tmpdir))
355 return error("could not create '%s'", tmpdir);
356 strbuf_addf(&ldir, "%s/left/", tmpdir);
357 strbuf_addf(&rdir, "%s/right/", tmpdir);
358 strbuf_addstr(&wtdir, workdir);
359 if (!wtdir.len || !is_dir_sep(wtdir.buf[wtdir.len - 1]))
360 strbuf_addch(&wtdir, '/');
361 mkdir(ldir.buf, 0700);
362 mkdir(rdir.buf, 0700);
363
364 memset(&wtindex, 0, sizeof(wtindex));
365
366 memset(&lstate, 0, sizeof(lstate));
882add13 367 lstate.base_dir = lbase_dir = xstrdup(ldir.buf);
03831ef7
JS
368 lstate.base_dir_len = ldir.len;
369 lstate.force = 1;
370 memset(&rstate, 0, sizeof(rstate));
882add13 371 rstate.base_dir = rbase_dir = xstrdup(rdir.buf);
03831ef7
JS
372 rstate.base_dir_len = rdir.len;
373 rstate.force = 1;
374
375 ldir_len = ldir.len;
376 rdir_len = rdir.len;
377 wtdir_len = wtdir.len;
378
7db316bc
SB
379 hashmap_init(&working_tree_dups, working_tree_entry_cmp, NULL, 0);
380 hashmap_init(&submodules, pair_cmp, NULL, 0);
381 hashmap_init(&symlinks2, pair_cmp, NULL, 0);
03831ef7
JS
382
383 child.no_stdin = 1;
384 child.git_cmd = 1;
385 child.use_shell = 0;
386 child.clean_on_exit = 1;
387 child.dir = prefix;
388 child.out = -1;
389 argv_array_pushl(&child.args, "diff", "--raw", "--no-abbrev", "-z",
390 NULL);
391 for (i = 0; i < argc; i++)
392 argv_array_push(&child.args, argv[i]);
393 if (start_command(&child))
394 die("could not obtain raw diff");
395 fp = xfdopen(child.out, "r");
396
397 /* Build index info for left and right sides of the diff */
398 i = 0;
399 while (!strbuf_getline_nul(&info, fp)) {
400 int lmode, rmode;
401 struct object_id loid, roid;
402 char status;
403 const char *src_path, *dst_path;
03831ef7
JS
404
405 if (starts_with(info.buf, "::"))
406 die(N_("combined diff formats('-c' and '--cc') are "
407 "not supported in\n"
408 "directory diff mode('-d' and '--dir-diff')."));
409
410 if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid,
411 &status))
412 break;
413 if (strbuf_getline_nul(&lpath, fp))
414 break;
415 src_path = lpath.buf;
03831ef7
JS
416
417 i++;
418 if (status != 'C' && status != 'R') {
419 dst_path = src_path;
03831ef7
JS
420 } else {
421 if (strbuf_getline_nul(&rpath, fp))
422 break;
423 dst_path = rpath.buf;
03831ef7
JS
424 }
425
426 if (S_ISGITLINK(lmode) || S_ISGITLINK(rmode)) {
427 strbuf_reset(&buf);
428 strbuf_addf(&buf, "Subproject commit %s",
429 oid_to_hex(&loid));
430 add_left_or_right(&submodules, src_path, buf.buf, 0);
431 strbuf_reset(&buf);
432 strbuf_addf(&buf, "Subproject commit %s",
433 oid_to_hex(&roid));
4a7e27e9 434 if (oideq(&loid, &roid))
03831ef7
JS
435 strbuf_addstr(&buf, "-dirty");
436 add_left_or_right(&submodules, dst_path, buf.buf, 1);
437 continue;
438 }
439
440 if (S_ISLNK(lmode)) {
18ec8005 441 char *content = get_symlink(&loid, src_path);
03831ef7
JS
442 add_left_or_right(&symlinks2, src_path, content, 0);
443 free(content);
444 }
445
446 if (S_ISLNK(rmode)) {
18ec8005 447 char *content = get_symlink(&roid, dst_path);
03831ef7
JS
448 add_left_or_right(&symlinks2, dst_path, content, 1);
449 free(content);
450 }
451
452 if (lmode && status != 'C') {
5f3296c0
JS
453 if (checkout_path(lmode, &loid, src_path, &lstate)) {
454 ret = error("could not write '%s'", src_path);
455 goto finish;
456 }
03831ef7
JS
457 }
458
18ec8005 459 if (rmode && !S_ISLNK(rmode)) {
03831ef7
JS
460 struct working_tree_entry *entry;
461
462 /* Avoid duplicate working_tree entries */
463 FLEX_ALLOC_STR(entry, path, dst_path);
d22245a2 464 hashmap_entry_init(&entry->entry, strhash(dst_path));
b6c52416
EW
465 if (hashmap_get(&working_tree_dups, &entry->entry,
466 NULL)) {
03831ef7
JS
467 free(entry);
468 continue;
469 }
b94e5c1d 470 hashmap_add(&working_tree_dups, &entry->entry);
03831ef7
JS
471
472 if (!use_wt_file(workdir, dst_path, &roid)) {
5f3296c0
JS
473 if (checkout_path(rmode, &roid, dst_path,
474 &rstate)) {
475 ret = error("could not write '%s'",
476 dst_path);
477 goto finish;
478 }
03831ef7
JS
479 } else if (!is_null_oid(&roid)) {
480 /*
481 * Changes in the working tree need special
482 * treatment since they are not part of the
483 * index.
484 */
485 struct cache_entry *ce2 =
a849735b 486 make_cache_entry(&wtindex, rmode, &roid,
03831ef7
JS
487 dst_path, 0, 0);
488
489 add_index_entry(&wtindex, ce2,
490 ADD_CACHE_JUST_APPEND);
491
492 add_path(&rdir, rdir_len, dst_path);
5f3296c0
JS
493 if (ensure_leading_directories(rdir.buf)) {
494 ret = error("could not create "
495 "directory for '%s'",
496 dst_path);
497 goto finish;
498 }
03831ef7
JS
499 add_path(&wtdir, wtdir_len, dst_path);
500 if (symlinks) {
501 if (symlink(wtdir.buf, rdir.buf)) {
502 ret = error_errno("could not symlink '%s' to '%s'", wtdir.buf, rdir.buf);
503 goto finish;
504 }
505 } else {
506 struct stat st;
507 if (stat(wtdir.buf, &st))
508 st.st_mode = 0644;
509 if (copy_file(rdir.buf, wtdir.buf,
510 st.st_mode)) {
511 ret = error("could not copy '%s' to '%s'", wtdir.buf, rdir.buf);
512 goto finish;
513 }
514 }
515 }
516 }
517 }
518
5f3296c0
JS
519 fclose(fp);
520 fp = NULL;
03831ef7
JS
521 if (finish_command(&child)) {
522 ret = error("error occurred running diff --raw");
523 goto finish;
524 }
525
526 if (!i)
5f3296c0 527 goto finish;
03831ef7
JS
528
529 /*
530 * Changes to submodules require special treatment.This loop writes a
531 * temporary file to both the left and right directories to show the
532 * change in the recorded SHA1 for the submodule.
533 */
534 hashmap_iter_init(&submodules, &iter);
535 while ((entry = hashmap_iter_next(&iter))) {
536 if (*entry->left) {
537 add_path(&ldir, ldir_len, entry->path);
538 ensure_leading_directories(ldir.buf);
539 write_file(ldir.buf, "%s", entry->left);
540 }
541 if (*entry->right) {
542 add_path(&rdir, rdir_len, entry->path);
543 ensure_leading_directories(rdir.buf);
544 write_file(rdir.buf, "%s", entry->right);
545 }
546 }
547
548 /*
549 * Symbolic links require special treatment.The standard "git diff"
550 * shows only the link itself, not the contents of the link target.
551 * This loop replicates that behavior.
552 */
553 hashmap_iter_init(&symlinks2, &iter);
554 while ((entry = hashmap_iter_next(&iter))) {
555 if (*entry->left) {
556 add_path(&ldir, ldir_len, entry->path);
557 ensure_leading_directories(ldir.buf);
558 write_file(ldir.buf, "%s", entry->left);
559 }
560 if (*entry->right) {
561 add_path(&rdir, rdir_len, entry->path);
562 ensure_leading_directories(rdir.buf);
563 write_file(rdir.buf, "%s", entry->right);
564 }
565 }
566
567 strbuf_release(&buf);
568
569 strbuf_setlen(&ldir, ldir_len);
570 helper_argv[1] = ldir.buf;
571 strbuf_setlen(&rdir, rdir_len);
572 helper_argv[2] = rdir.buf;
573
574 if (extcmd) {
575 helper_argv[0] = extcmd;
576 flags = 0;
577 } else
578 setenv("GIT_DIFFTOOL_DIRDIFF", "true", 1);
579 rc = run_command_v_opt(helper_argv, flags);
580
581 /*
582 * If the diff includes working copy files and those
583 * files were modified during the diff, then the changes
584 * should be copied back to the working tree.
585 * Do not copy back files when symlinks are used and the
586 * external tool did not replace the original link with a file.
587 *
588 * These hashes are loaded lazily since they aren't needed
589 * in the common case of --symlinks and the difftool updating
590 * files through the symlink.
591 */
7db316bc
SB
592 hashmap_init(&wt_modified, path_entry_cmp, NULL, wtindex.cache_nr);
593 hashmap_init(&tmp_modified, path_entry_cmp, NULL, wtindex.cache_nr);
03831ef7
JS
594
595 for (i = 0; i < wtindex.cache_nr; i++) {
596 struct hashmap_entry dummy;
597 const char *name = wtindex.cache[i]->name;
598 struct stat st;
599
600 add_path(&rdir, rdir_len, name);
601 if (lstat(rdir.buf, &st))
602 continue;
603
604 if ((symlinks && S_ISLNK(st.st_mode)) || !S_ISREG(st.st_mode))
605 continue;
606
607 if (!indices_loaded) {
b2275868 608 struct lock_file lock = LOCK_INIT;
03831ef7
JS
609 strbuf_reset(&buf);
610 strbuf_addf(&buf, "%s/wtindex", tmpdir);
611 if (hold_lock_file_for_update(&lock, buf.buf, 0) < 0 ||
612 write_locked_index(&wtindex, &lock, COMMIT_LOCK)) {
613 ret = error("could not write %s", buf.buf);
03831ef7
JS
614 goto finish;
615 }
616 changed_files(&wt_modified, buf.buf, workdir);
617 strbuf_setlen(&rdir, rdir_len);
618 changed_files(&tmp_modified, buf.buf, rdir.buf);
619 add_path(&rdir, rdir_len, name);
620 indices_loaded = 1;
621 }
622
623 hashmap_entry_init(&dummy, strhash(name));
624 if (hashmap_get(&tmp_modified, &dummy, name)) {
625 add_path(&wtdir, wtdir_len, name);
626 if (hashmap_get(&wt_modified, &dummy, name)) {
627 warning(_("both files modified: '%s' and '%s'."),
628 wtdir.buf, rdir.buf);
629 warning(_("working tree file has been left."));
94d3997e 630 warning("%s", "");
03831ef7
JS
631 err = 1;
632 } else if (unlink(wtdir.buf) ||
633 copy_file(wtdir.buf, rdir.buf, st.st_mode))
634 warning_errno(_("could not copy '%s' to '%s'"),
635 rdir.buf, wtdir.buf);
636 }
637 }
638
639 if (err) {
640 warning(_("temporary files exist in '%s'."), tmpdir);
641 warning(_("you may want to cleanup or recover these."));
642 exit(1);
643 } else
644 exit_cleanup(tmpdir, rc);
645
646finish:
5f3296c0
JS
647 if (fp)
648 fclose(fp);
649
882add13
JS
650 free(lbase_dir);
651 free(rbase_dir);
03831ef7
JS
652 strbuf_release(&ldir);
653 strbuf_release(&rdir);
654 strbuf_release(&wtdir);
655 strbuf_release(&buf);
656
657 return ret;
658}
659
660static int run_file_diff(int prompt, const char *prefix,
661 int argc, const char **argv)
662{
663 struct argv_array args = ARGV_ARRAY_INIT;
664 const char *env[] = {
665 "GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL,
666 NULL
667 };
668 int ret = 0, i;
669
670 if (prompt > 0)
671 env[2] = "GIT_DIFFTOOL_PROMPT=true";
672 else if (!prompt)
673 env[2] = "GIT_DIFFTOOL_NO_PROMPT=true";
674
675
676 argv_array_push(&args, "diff");
677 for (i = 0; i < argc; i++)
678 argv_array_push(&args, argv[i]);
679 ret = run_command_v_opt_cd_env(args.argv, RUN_GIT_CMD, prefix, env);
680 exit(ret);
681}
be8a90e5 682
be8a90e5
JS
683int cmd_difftool(int argc, const char **argv, const char *prefix)
684{
03831ef7 685 int use_gui_tool = 0, dir_diff = 0, prompt = -1, symlinks = 0,
20de316e 686 tool_help = 0, no_index = 0;
03831ef7
JS
687 static char *difftool_cmd = NULL, *extcmd = NULL;
688 struct option builtin_difftool_options[] = {
689 OPT_BOOL('g', "gui", &use_gui_tool,
690 N_("use `diff.guitool` instead of `diff.tool`")),
691 OPT_BOOL('d', "dir-diff", &dir_diff,
692 N_("perform a full-directory diff")),
3e4a67b4 693 OPT_SET_INT_F('y', "no-prompt", &prompt,
03831ef7 694 N_("do not prompt before launching a diff tool"),
3e4a67b4
NTND
695 0, PARSE_OPT_NONEG),
696 OPT_SET_INT_F(0, "prompt", &prompt, NULL,
697 1, PARSE_OPT_NONEG | PARSE_OPT_HIDDEN),
03831ef7
JS
698 OPT_BOOL(0, "symlinks", &symlinks,
699 N_("use symlinks in dir-diff mode")),
9f6013a8 700 OPT_STRING('t', "tool", &difftool_cmd, N_("tool"),
03831ef7
JS
701 N_("use the specified diff tool")),
702 OPT_BOOL(0, "tool-help", &tool_help,
703 N_("print a list of diff tools that may be used with "
704 "`--tool`")),
705 OPT_BOOL(0, "trust-exit-code", &trust_exit_code,
706 N_("make 'git-difftool' exit when an invoked diff "
707 "tool returns a non - zero exit code")),
9f6013a8 708 OPT_STRING('x', "extcmd", &extcmd, N_("command"),
03831ef7 709 N_("specify a custom command for viewing diffs")),
20de316e 710 OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")),
03831ef7
JS
711 OPT_END()
712 };
713
03831ef7
JS
714 git_config(difftool_config, NULL);
715 symlinks = has_symlinks;
716
717 argc = parse_options(argc, argv, prefix, builtin_difftool_options,
718 builtin_difftool_usage, PARSE_OPT_KEEP_UNKNOWN |
719 PARSE_OPT_KEEP_DASHDASH);
be8a90e5 720
03831ef7
JS
721 if (tool_help)
722 return print_tool_help();
723
20de316e
JS
724 if (!no_index && !startup_info->have_repository)
725 die(_("difftool requires worktree or --no-index"));
726
727 if (!no_index){
728 setup_work_tree();
729 setenv(GIT_DIR_ENVIRONMENT, absolute_path(get_git_dir()), 1);
730 setenv(GIT_WORK_TREE_ENVIRONMENT, absolute_path(get_git_work_tree()), 1);
f3a3a021
JS
731 } else if (dir_diff)
732 die(_("--dir-diff is incompatible with --no-index"));
d81345ce 733
7f978d7d
DL
734 if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
735 die(_("--gui, --tool and --extcmd are mutually exclusive"));
736
6c22d715
DL
737 if (use_gui_tool)
738 setenv("GIT_MERGETOOL_GUI", "true", 1);
03831ef7
JS
739 else if (difftool_cmd) {
740 if (*difftool_cmd)
741 setenv("GIT_DIFF_TOOL", difftool_cmd, 1);
742 else
743 die(_("no <tool> given for --tool=<tool>"));
744 }
745
746 if (extcmd) {
747 if (*extcmd)
748 setenv("GIT_DIFFTOOL_EXTCMD", extcmd, 1);
749 else
750 die(_("no <cmd> given for --extcmd=<cmd>"));
751 }
752
753 setenv("GIT_DIFFTOOL_TRUST_EXIT_CODE",
754 trust_exit_code ? "true" : "false", 1);
755
756 /*
757 * In directory diff mode, 'git-difftool--helper' is called once
758 * to compare the a / b directories. In file diff mode, 'git diff'
759 * will invoke a separate instance of 'git-difftool--helper' for
760 * each file that changed.
761 */
762 if (dir_diff)
763 return run_dir_diff(extcmd, symlinks, prefix, argc, argv);
764 return run_file_diff(prompt, prefix, argc, argv);
be8a90e5 765}