[thirdparty/git.git] / git-difftool.perl

#!/usr/bin/perl
# Copyright (c) 2009, 2010 David Aguilar
# Copyright (c) 2012 Tim Henigan
#
# This is a wrapper around the GIT_EXTERNAL_DIFF-compatible
# git-difftool--helper script.
#
# This script exports GIT_EXTERNAL_DIFF and GIT_PAGER for use by git.
# The GIT_DIFF* variables are exported for use by git-difftool--helper.
#
# Any arguments that are unknown to this script are forwarded to 'git diff'.

use 5.008;
use strict;
use warnings;
use Error qw(:try);
use File::Basename qw(dirname);
use File::Copy;
use File::Find;
use File::stat;
use File::Path qw(mkpath rmtree);
use File::Temp qw(tempdir);
use Getopt::Long qw(:config pass_through);
use Git;

sub usage
{
	my $exitcode = shift;
	print << 'USAGE';
usage: git difftool [-t|--tool=<tool>] [--tool-help]
                    [-x|--extcmd=<cmd>]
                    [-g|--gui] [--no-gui]
                    [--prompt] [-y|--no-prompt]
                    [-d|--dir-diff]
                    ['git diff' options]
USAGE
	exit($exitcode);
}

sub print_tool_help
{
	# See the comment at the bottom of file_diff() for the reason behind
	# using system() followed by exit() instead of exec().
	my $rc = system(qw(git mergetool --tool-help=diff));
	exit($rc | ($rc >> 8));
}

sub exit_cleanup
{
	my ($tmpdir, $status) = @_;
	my $errno = $!;
	rmtree($tmpdir);
	if ($status and $errno) {
		my ($package, $file, $line) = caller();
		warn "$file line $line: $errno\n";
	}
	exit($status | ($status >> 8));
}

sub use_wt_file
{
	my ($workdir, $file, $sha1) = @_;
	my $null_sha1 = '0' x 40;

	if (-l "$workdir/$file" || ! -e _) {
		return (0, $null_sha1);
	}

	my $wt_sha1 = Git::command_oneline('hash-object', "$workdir/$file");
	my $use = ($sha1 eq $null_sha1) || ($sha1 eq $wt_sha1);
	return ($use, $wt_sha1);
}

sub changed_files
{
	my ($repo_path, $index, $worktree) = @_;
	$ENV{GIT_INDEX_FILE} = $index;

	my @gitargs = ('--git-dir', $repo_path, '--work-tree', $worktree);
	my @refreshargs = (
		@gitargs, 'update-index',
		'--really-refresh', '-q', '--unmerged');
	try {
		Git::command_oneline(@refreshargs);
	} catch Git::Error::Command with {};

	my @diffargs = (@gitargs, 'diff-files', '--name-only', '-z');
	my $line = Git::command_oneline(@diffargs);
	my @files;
	if (defined $line) {
		@files = split('\0', $line);
	} else {
		@files = ();
	}

	delete($ENV{GIT_INDEX_FILE});

	return map { $_ => 1 } @files;
}

sub setup_dir_diff
{
	my ($workdir, $symlinks) = @_;
	my @gitargs = ('diff', '--raw', '--no-abbrev', '-z', @ARGV);
	my $diffrtn = Git::command_oneline(@gitargs);
	exit(0) unless defined($diffrtn);

	# Build index info for left and right sides of the diff
	my $submodule_mode = '160000';
	my $symlink_mode = '120000';
	my $null_mode = '0' x 6;
	my $null_sha1 = '0' x 40;
	my $lindex = '';
	my $rindex = '';
	my $wtindex = '';
	my %submodule;
	my %symlink;
	my @working_tree = ();
	my %working_tree_dups = ();
	my @rawdiff = split('\0', $diffrtn);

	my $i = 0;
	while ($i < $#rawdiff) {
		if ($rawdiff[$i] =~ /^::/) {
			warn << 'EOF';
Combined diff formats ('-c' and '--cc') are not supported in
directory diff mode ('-d' and '--dir-diff').
EOF
			exit(1);
		}

		my ($lmode, $rmode, $lsha1, $rsha1, $status) =
			split(' ', substr($rawdiff[$i], 1));
		my $src_path = $rawdiff[$i + 1];
		my $dst_path;

		if ($status =~ /^[CR]/) {
			$dst_path = $rawdiff[$i + 2];
			$i += 3;
		} else {
			$dst_path = $src_path;
			$i += 2;
		}

		if ($lmode eq $submodule_mode or $rmode eq $submodule_mode) {
			$submodule{$src_path}{left} = $lsha1;
			if ($lsha1 ne $rsha1) {
				$submodule{$dst_path}{right} = $rsha1;
			} else {
				$submodule{$dst_path}{right} = "$rsha1-dirty";
			}
			next;
		}

		if ($lmode eq $symlink_mode) {
			$symlink{$src_path}{left} =
				Git::command_oneline('show', $lsha1);
		}

		if ($rmode eq $symlink_mode) {
			$symlink{$dst_path}{right} =
				Git::command_oneline('show', $rsha1);
		}

		if ($lmode ne $null_mode and $status !~ /^C/) {
			$lindex .= "$lmode $lsha1\t$src_path\0";
		}

		if ($rmode ne $null_mode) {
			# Avoid duplicate working_tree entries
			if ($working_tree_dups{$dst_path}++) {
				next;
			}
			my ($use, $wt_sha1) =
				use_wt_file($workdir, $dst_path, $rsha1);
			if ($use) {
				push @working_tree, $dst_path;
				$wtindex .= "$rmode $wt_sha1\t$dst_path\0";
			} else {
				$rindex .= "$rmode $rsha1\t$dst_path\0";
			}
		}
	}

	# Setup temp directories
	my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 0, TMPDIR => 1);
	my $ldir = "$tmpdir/left";
	my $rdir = "$tmpdir/right";
	mkpath($ldir) or exit_cleanup($tmpdir, 1);
	mkpath($rdir) or exit_cleanup($tmpdir, 1);

	# Populate the left and right directories based on each index file
	my ($inpipe, $ctx);
	$ENV{GIT_INDEX_FILE} = "$tmpdir/lindex";
	($inpipe, $ctx) =
		Git::command_input_pipe('update-index', '-z', '--index-info');
	print($inpipe $lindex);
	Git::command_close_pipe($inpipe, $ctx);

	my $rc = system('git', 'checkout-index', '--all', "--prefix=$ldir/");
	exit_cleanup($tmpdir, $rc) if $rc != 0;

	$ENV{GIT_INDEX_FILE} = "$tmpdir/rindex";
	($inpipe, $ctx) =
		Git::command_input_pipe('update-index', '-z', '--index-info');
	print($inpipe $rindex);
	Git::command_close_pipe($inpipe, $ctx);

	$rc = system('git', 'checkout-index', '--all', "--prefix=$rdir/");
	exit_cleanup($tmpdir, $rc) if $rc != 0;

	$ENV{GIT_INDEX_FILE} = "$tmpdir/wtindex";
	($inpipe, $ctx) =
		Git::command_input_pipe('update-index', '--info-only', '-z', '--index-info');
	print($inpipe $wtindex);
	Git::command_close_pipe($inpipe, $ctx);

	# If $GIT_DIR was explicitly set just for the update/checkout
	# commands, then it should be unset before continuing.
	delete($ENV{GIT_INDEX_FILE});

	# Changes in the working tree need special treatment since they are
	# not part of the index. Remove any trailing slash from $workdir
	# before starting to avoid double slashes in symlink targets.
	$workdir =~ s|/$||;
	for my $file (@working_tree) {
		my $dir = dirname($file);
		unless (-d "$rdir/$dir") {
			mkpath("$rdir/$dir") or
			exit_cleanup($tmpdir, 1);
		}
		if ($symlinks) {
			symlink("$workdir/$file", "$rdir/$file") or
			exit_cleanup($tmpdir, 1);
		} else {
			copy("$workdir/$file", "$rdir/$file") or
			exit_cleanup($tmpdir, 1);

			my $mode = stat("$workdir/$file")->mode;
			chmod($mode, "$rdir/$file") or
			exit_cleanup($tmpdir, 1);
		}
	}

	# Changes to submodules require special treatment. This loop writes a
	# temporary file to both the left and right directories to show the
	# change in the recorded SHA1 for the submodule.
	for my $path (keys %submodule) {
		my $ok = 0;
		if (defined($submodule{$path}{left})) {
			$ok = write_to_file("$ldir/$path",
				"Subproject commit $submodule{$path}{left}");
		}
		if (defined($submodule{$path}{right})) {
			$ok = write_to_file("$rdir/$path",
				"Subproject commit $submodule{$path}{right}");
		}
		exit_cleanup($tmpdir, 1) if not $ok;
	}

	# Symbolic links require special treatment. The standard "git diff"
	# shows only the link itself, not the contents of the link target.
	# This loop replicates that behavior.
	for my $path (keys %symlink) {
		my $ok = 0;
		if (defined($symlink{$path}{left})) {
			$ok = write_to_file("$ldir/$path",
					$symlink{$path}{left});
		}
		if (defined($symlink{$path}{right})) {
			$ok = write_to_file("$rdir/$path",
					$symlink{$path}{right});
		}
		exit_cleanup($tmpdir, 1) if not $ok;
	}

	return ($ldir, $rdir, $tmpdir, @working_tree);
}

sub write_to_file
{
	my $path = shift;
	my $value = shift;

	# Make sure the path to the file exists
	my $dir = dirname($path);
	unless (-d "$dir") {
		mkpath("$dir") or return 0;
	}

	# If the file already exists in that location, delete it.  This
	# is required in the case of symbolic links.
	unlink($path);

	open(my $fh, '>', $path) or return 0;
	print($fh $value);
	close($fh);

	return 1;
}

sub main
{
	# parse command-line options. all unrecognized options and arguments
	# are passed through to the 'git diff' command.
	my %opts = (
		difftool_cmd => undef,
		dirdiff => undef,
		extcmd => undef,
		gui => undef,
		help => undef,
		prompt => undef,
		symlinks => $^O ne 'cygwin' &&
				$^O ne 'MSWin32' && $^O ne 'msys',
		tool_help => undef,
		trust_exit_code => undef,
	);
	GetOptions('g|gui!' => \$opts{gui},
		'd|dir-diff' => \$opts{dirdiff},
		'h' => \$opts{help},
		'prompt!' => \$opts{prompt},
		'y' => sub { $opts{prompt} = 0; },
		'symlinks' => \$opts{symlinks},
		'no-symlinks' => sub { $opts{symlinks} = 0; },
		't|tool:s' => \$opts{difftool_cmd},
		'tool-help' => \$opts{tool_help},
		'trust-exit-code' => \$opts{trust_exit_code},
		'no-trust-exit-code' => sub { $opts{trust_exit_code} = 0; },
		'x|extcmd:s' => \$opts{extcmd});

	if (defined($opts{help})) {
		usage(0);
	}
	if (defined($opts{tool_help})) {
		print_tool_help();
	}
	if (defined($opts{difftool_cmd})) {
		if (length($opts{difftool_cmd}) > 0) {
			$ENV{GIT_DIFF_TOOL} = $opts{difftool_cmd};
		} else {
			print "No <tool> given for --tool=<tool>\n";
			usage(1);
		}
	}
	if (defined($opts{extcmd})) {
		if (length($opts{extcmd}) > 0) {
			$ENV{GIT_DIFFTOOL_EXTCMD} = $opts{extcmd};
		} else {
			print "No <cmd> given for --extcmd=<cmd>\n";
			usage(1);
		}
	}
	if ($opts{gui}) {
		my $guitool = Git::config('diff.guitool');
		if (defined($guitool) && length($guitool) > 0) {
			$ENV{GIT_DIFF_TOOL} = $guitool;
		}
	}

	if (!defined $opts{trust_exit_code}) {
		$opts{trust_exit_code} = Git::config_bool('difftool.trustExitCode');
	}
	if ($opts{trust_exit_code}) {
		$ENV{GIT_DIFFTOOL_TRUST_EXIT_CODE} = 'true';
	} else {
		$ENV{GIT_DIFFTOOL_TRUST_EXIT_CODE} = 'false';
	}

	# In directory diff mode, 'git-difftool--helper' is called once
	# to compare the a/b directories.  In file diff mode, 'git diff'
	# will invoke a separate instance of 'git-difftool--helper' for
	# each file that changed.
	if (defined($opts{dirdiff})) {
		dir_diff($opts{extcmd}, $opts{symlinks});
	} else {
		file_diff($opts{prompt});
	}
}

sub dir_diff
{
	my ($extcmd, $symlinks) = @_;
	my $rc;
	my $error = 0;
	my $repo = Git->repository();
	my $repo_path = $repo->repo_path();
	my $workdir = $repo->wc_path();
	my ($a, $b, $tmpdir, @worktree) = setup_dir_diff($workdir, $symlinks);

	if (defined($extcmd)) {
		$rc = system($extcmd, $a, $b);
	} else {
		$ENV{GIT_DIFFTOOL_DIRDIFF} = 'true';
		$rc = system('git', 'difftool--helper', $a, $b);
	}
	# If the diff including working copy files and those
	# files were modified during the diff, then the changes
	# should be copied back to the working tree.
	# Do not copy back files when symlinks are used and the
	# external tool did not replace the original link with a file.
	#
	# These hashes are loaded lazily since they aren't needed
	# in the common case of --symlinks and the difftool updating
	# files through the symlink.
	my %wt_modified;
	my %tmp_modified;
	my $indices_loaded = 0;

	for my $file (@worktree) {
		next if $symlinks && -l "$b/$file";
		next if ! -f "$b/$file";

		if (!$indices_loaded) {
			%wt_modified = changed_files(
				$repo_path, "$tmpdir/wtindex", $workdir);
			%tmp_modified = changed_files(
				$repo_path, "$tmpdir/wtindex", $b);
			$indices_loaded = 1;
		}

		if (exists $wt_modified{$file} and exists $tmp_modified{$file}) {
			my $errmsg = "warning: Both files modified: ";
			$errmsg .= "'$workdir/$file' and '$b/$file'.\n";
			$errmsg .= "warning: Working tree file has been left.\n";
			$errmsg .= "warning:\n";
			warn $errmsg;
			$error = 1;
		} elsif (exists $tmp_modified{$file}) {
			my $mode = stat("$b/$file")->mode;
			copy("$b/$file", "$workdir/$file") or
			exit_cleanup($tmpdir, 1);

			chmod($mode, "$workdir/$file") or
			exit_cleanup($tmpdir, 1);
		}
	}
	if ($error) {
		warn "warning: Temporary files exist in '$tmpdir'.\n";
		warn "warning: You may want to cleanup or recover these.\n";
		exit(1);
	} else {
		exit_cleanup($tmpdir, $rc);
	}
}

sub file_diff
{
	my ($prompt) = @_;

	if (defined($prompt)) {
		if ($prompt) {
			$ENV{GIT_DIFFTOOL_PROMPT} = 'true';
		} else {
			$ENV{GIT_DIFFTOOL_NO_PROMPT} = 'true';
		}
	}

	$ENV{GIT_PAGER} = '';
	$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';

	# ActiveState Perl for Win32 does not implement POSIX semantics of
	# exec* system call. It just spawns the given executable and finishes
	# the starting program, exiting with code 0.
	# system will at least catch the errors returned by git diff,
	# allowing the caller of git difftool better handling of failures.
	my $rc = system('git', 'diff', @ARGV);
	exit($rc | ($rc >> 8));
}

main();
Commit	Line	Data
7e0abcec	1	#!/usr/bin/perl
f47f1e2c	2	# Copyright (c) 2009, 2010 David Aguilar
7e0abcec	3	# Copyright (c) 2012 Tim Henigan
5c38ea31 DA	4	#
5c38ea31 DA	5	# This is a wrapper around the GIT_EXTERNAL_DIFF-compatible
a904392e DA	6	# git-difftool--helper script.
	7	#
	8	# This script exports GIT_EXTERNAL_DIFF and GIT_PAGER for use by git.
7e0abcec	9	# The GIT_DIFF* variables are exported for use by git-difftool--helper.
a904392e	10	#
5c38ea31 DA	11	# Any arguments that are unknown to this script are forwarded to 'git diff'.
5c38ea31 DA	12
d48b2841	13	use 5.008;
5c38ea31 DA	14	use strict;
5c38ea31 DA	15	use warnings;
67aa147a	16	use Error qw(:try);
7c7584b9	17	use File::Basename qw(dirname);
7e0abcec	18	use File::Copy;
7c7584b9	19	use File::Find;
7e0abcec	20	use File::stat;
ceb1497a	21	use File::Path qw(mkpath rmtree);
7e0abcec	22	use File::Temp qw(tempdir);
3f94ff75 TH	23	use Getopt::Long qw(:config pass_through);
3f94ff75 TH	24	use Git;
5c38ea31 DA	25
	26	sub usage
	27	{
28360769	28	my $exitcode = shift;
5c38ea31	29	print << 'USAGE';
bf73fc21	30	usage: git difftool [-t\|--tool=<tool>] [--tool-help]
85089604 TH	31	[-x\|--extcmd=<cmd>]
85089604 TH	32	[-g\|--gui] [--no-gui]
3f94ff75	33	[--prompt] [-y\|--no-prompt]
7e0abcec	34	[-d\|--dir-diff]
f47f1e2c	35	['git diff' options]
5c38ea31	36	USAGE
28360769	37	exit($exitcode);
5c38ea31 DA	38	}
5c38ea31 DA	39
bf73fc21 TH	40	sub print_tool_help
bf73fc21 TH	41	{
abaf175c JK	42	# See the comment at the bottom of file_diff() for the reason behind
abaf175c JK	43	# using system() followed by exit() instead of exec().
4fb4b02d	44	my $rc = system(qw(git mergetool --tool-help=diff));
abaf175c	45	exit($rc \| ($rc >> 8));
bf73fc21 TH	46	}
bf73fc21 TH	47
ceb1497a DA	48	sub exit_cleanup
	49	{
	50	my ($tmpdir, $status) = @_;
	51	my $errno = $!;
	52	rmtree($tmpdir);
	53	if ($status and $errno) {
	54	my ($package, $file, $line) = caller();
	55	warn "$file line $line: $errno\n";
	56	}
	57	exit($status \| ($status >> 8));
	58	}
	59
02c56314 JK	60	sub use_wt_file
02c56314 JK	61	{
32b8c581	62	my ($workdir, $file, $sha1) = @_;
02c56314 JK	63	my $null_sha1 = '0' x 40;
02c56314 JK	64
cfe2d4be	65	if (-l "$workdir/$file" \|\| ! -e _) {
1f197a1d JK	66	return (0, $null_sha1);
	67	}
	68
32b8c581	69	my $wt_sha1 = Git::command_oneline('hash-object', "$workdir/$file");
67aa147a JK	70	my $use = ($sha1 eq $null_sha1) \|\| ($sha1 eq $wt_sha1);
	71	return ($use, $wt_sha1);
	72	}
	73
	74	sub changed_files
	75	{
	76	my ($repo_path, $index, $worktree) = @_;
	77	$ENV{GIT_INDEX_FILE} = $index;
67aa147a	78
98f917ed DA	79	my @gitargs = ('--git-dir', $repo_path, '--work-tree', $worktree);
	80	my @refreshargs = (
	81	@gitargs, 'update-index',
	82	'--really-refresh', '-q', '--unmerged');
67aa147a JK	83	try {
	84	Git::command_oneline(@refreshargs);
	85	} catch Git::Error::Command with {};
	86
98f917ed DA	87	my @diffargs = (@gitargs, 'diff-files', '--name-only', '-z');
98f917ed DA	88	my $line = Git::command_oneline(@diffargs);
67aa147a JK	89	my @files;
	90	if (defined $line) {
	91	@files = split('\0', $line);
	92	} else {
	93	@files = ();
	94	}
	95
	96	delete($ENV{GIT_INDEX_FILE});
67aa147a JK	97
67aa147a JK	98	return map { $_ => 1 } @files;
02c56314 JK	99	}
02c56314 JK	100
7e0abcec TH	101	sub setup_dir_diff
7e0abcec TH	102	{
32b8c581	103	my ($workdir, $symlinks) = @_;
a4cd5be3	104	my @gitargs = ('diff', '--raw', '--no-abbrev', '-z', @ARGV);
32b8c581	105	my $diffrtn = Git::command_oneline(@gitargs);
ed36e5bd	106	exit(0) unless defined($diffrtn);
7e0abcec	107
7e0abcec TH	108	# Build index info for left and right sides of the diff
	109	my $submodule_mode = '160000';
	110	my $symlink_mode = '120000';
	111	my $null_mode = '0' x 6;
	112	my $null_sha1 = '0' x 40;
	113	my $lindex = '';
	114	my $rindex = '';
67aa147a	115	my $wtindex = '';
7e0abcec TH	116	my %submodule;
7e0abcec TH	117	my %symlink;
75cd7583	118	my @working_tree = ();
366f9cea	119	my %working_tree_dups = ();
7e0abcec TH	120	my @rawdiff = split('\0', $diffrtn);
	121
	122	my $i = 0;
	123	while ($i < $#rawdiff) {
	124	if ($rawdiff[$i] =~ /^::/) {
a4cd5be3 DA	125	warn << 'EOF';
	126	Combined diff formats ('-c' and '--cc') are not supported in
	127	directory diff mode ('-d' and '--dir-diff').
	128	EOF
7e0abcec TH	129	exit(1);
	130	}
	131
a4cd5be3 DA	132	my ($lmode, $rmode, $lsha1, $rsha1, $status) =
a4cd5be3 DA	133	split(' ', substr($rawdiff[$i], 1));
7e0abcec TH	134	my $src_path = $rawdiff[$i + 1];
	135	my $dst_path;
	136
	137	if ($status =~ /^[CR]/) {
	138	$dst_path = $rawdiff[$i + 2];
	139	$i += 3;
	140	} else {
	141	$dst_path = $src_path;
	142	$i += 2;
	143	}
	144
a4cd5be3	145	if ($lmode eq $submodule_mode or $rmode eq $submodule_mode) {
7e0abcec TH	146	$submodule{$src_path}{left} = $lsha1;
	147	if ($lsha1 ne $rsha1) {
	148	$submodule{$dst_path}{right} = $rsha1;
	149	} else {
	150	$submodule{$dst_path}{right} = "$rsha1-dirty";
	151	}
	152	next;
	153	}
	154
	155	if ($lmode eq $symlink_mode) {
a4cd5be3	156	$symlink{$src_path}{left} =
32b8c581	157	Git::command_oneline('show', $lsha1);
7e0abcec TH	158	}
	159
	160	if ($rmode eq $symlink_mode) {
a4cd5be3	161	$symlink{$dst_path}{right} =
32b8c581	162	Git::command_oneline('show', $rsha1);
7e0abcec TH	163	}
7e0abcec TH	164
a4cd5be3	165	if ($lmode ne $null_mode and $status !~ /^C/) {
7e0abcec TH	166	$lindex .= "$lmode $lsha1\t$src_path\0";
	167	}
	168
	169	if ($rmode ne $null_mode) {
366f9cea DA	170	# Avoid duplicate working_tree entries
	171	if ($working_tree_dups{$dst_path}++) {
	172	next;
	173	}
32b8c581 DA	174	my ($use, $wt_sha1) =
32b8c581 DA	175	use_wt_file($workdir, $dst_path, $rsha1);
67aa147a JK	176	if ($use) {
	177	push @working_tree, $dst_path;
	178	$wtindex .= "$rmode $wt_sha1\t$dst_path\0";
02c56314 JK	179	} else {
02c56314 JK	180	$rindex .= "$rmode $rsha1\t$dst_path\0";
7e0abcec TH	181	}
	182	}
	183	}
	184
ceb1497a DA	185	# Setup temp directories
	186	my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 0, TMPDIR => 1);
	187	my $ldir = "$tmpdir/left";
	188	my $rdir = "$tmpdir/right";
	189	mkpath($ldir) or exit_cleanup($tmpdir, 1);
	190	mkpath($rdir) or exit_cleanup($tmpdir, 1);
	191
7e0abcec TH	192	# Populate the left and right directories based on each index file
	193	my ($inpipe, $ctx);
	194	$ENV{GIT_INDEX_FILE} = "$tmpdir/lindex";
a4cd5be3	195	($inpipe, $ctx) =
32b8c581	196	Git::command_input_pipe('update-index', '-z', '--index-info');
7e0abcec	197	print($inpipe $lindex);
32b8c581	198	Git::command_close_pipe($inpipe, $ctx);
ceb1497a	199
75cd7583	200	my $rc = system('git', 'checkout-index', '--all', "--prefix=$ldir/");
ceb1497a	201	exit_cleanup($tmpdir, $rc) if $rc != 0;
7e0abcec TH	202
7e0abcec TH	203	$ENV{GIT_INDEX_FILE} = "$tmpdir/rindex";
a4cd5be3	204	($inpipe, $ctx) =
32b8c581	205	Git::command_input_pipe('update-index', '-z', '--index-info');
7e0abcec	206	print($inpipe $rindex);
32b8c581	207	Git::command_close_pipe($inpipe, $ctx);
ceb1497a	208
7e0abcec	209	$rc = system('git', 'checkout-index', '--all', "--prefix=$rdir/");
ceb1497a	210	exit_cleanup($tmpdir, $rc) if $rc != 0;
7e0abcec	211
67aa147a JK	212	$ENV{GIT_INDEX_FILE} = "$tmpdir/wtindex";
67aa147a JK	213	($inpipe, $ctx) =
32b8c581	214	Git::command_input_pipe('update-index', '--info-only', '-z', '--index-info');
67aa147a	215	print($inpipe $wtindex);
32b8c581	216	Git::command_close_pipe($inpipe, $ctx);
67aa147a	217
7e0abcec TH	218	# If $GIT_DIR was explicitly set just for the update/checkout
7e0abcec TH	219	# commands, then it should be unset before continuing.
7e0abcec TH	220	delete($ENV{GIT_INDEX_FILE});
	221
	222	# Changes in the working tree need special treatment since they are
e0976dcf JK	223	# not part of the index. Remove any trailing slash from $workdir
	224	# before starting to avoid double slashes in symlink targets.
	225	$workdir =~ s\|/$\|\|;
7e0abcec TH	226	for my $file (@working_tree) {
	227	my $dir = dirname($file);
	228	unless (-d "$rdir/$dir") {
ceb1497a DA	229	mkpath("$rdir/$dir") or
ceb1497a DA	230	exit_cleanup($tmpdir, 1);
7e0abcec	231	}
1f229345	232	if ($symlinks) {
ceb1497a DA	233	symlink("$workdir/$file", "$rdir/$file") or
ceb1497a DA	234	exit_cleanup($tmpdir, 1);
1f229345	235	} else {
ceb1497a DA	236	copy("$workdir/$file", "$rdir/$file") or
	237	exit_cleanup($tmpdir, 1);
	238
1f229345	239	my $mode = stat("$workdir/$file")->mode;
ceb1497a DA	240	chmod($mode, "$rdir/$file") or
ceb1497a DA	241	exit_cleanup($tmpdir, 1);
1f229345	242	}
7e0abcec TH	243	}
	244
	245	# Changes to submodules require special treatment. This loop writes a
	246	# temporary file to both the left and right directories to show the
	247	# change in the recorded SHA1 for the submodule.
	248	for my $path (keys %submodule) {
951b551d	249	my $ok = 0;
7e0abcec	250	if (defined($submodule{$path}{left})) {
ceb1497a DA	251	$ok = write_to_file("$ldir/$path",
ceb1497a DA	252	"Subproject commit $submodule{$path}{left}");
7e0abcec TH	253	}
7e0abcec TH	254	if (defined($submodule{$path}{right})) {
ceb1497a DA	255	$ok = write_to_file("$rdir/$path",
ceb1497a DA	256	"Subproject commit $submodule{$path}{right}");
7e0abcec	257	}
ceb1497a	258	exit_cleanup($tmpdir, 1) if not $ok;
7e0abcec TH	259	}
	260
	261	# Symbolic links require special treatment. The standard "git diff"
	262	# shows only the link itself, not the contents of the link target.
	263	# This loop replicates that behavior.
	264	for my $path (keys %symlink) {
951b551d	265	my $ok = 0;
7e0abcec	266	if (defined($symlink{$path}{left})) {
ceb1497a DA	267	$ok = write_to_file("$ldir/$path",
ceb1497a DA	268	$symlink{$path}{left});
7e0abcec TH	269	}
7e0abcec TH	270	if (defined($symlink{$path}{right})) {
ceb1497a DA	271	$ok = write_to_file("$rdir/$path",
ceb1497a DA	272	$symlink{$path}{right});
7e0abcec	273	}
ceb1497a	274	exit_cleanup($tmpdir, 1) if not $ok;
7e0abcec TH	275	}
7e0abcec TH	276
ceb1497a	277	return ($ldir, $rdir, $tmpdir, @working_tree);
7e0abcec TH	278	}
	279
	280	sub write_to_file
	281	{
	282	my $path = shift;
	283	my $value = shift;
	284
	285	# Make sure the path to the file exists
	286	my $dir = dirname($path);
	287	unless (-d "$dir") {
ceb1497a	288	mkpath("$dir") or return 0;
7e0abcec TH	289	}
	290
	291	# If the file already exists in that location, delete it. This
	292	# is required in the case of symbolic links.
ceb1497a	293	unlink($path);
7e0abcec	294
ceb1497a	295	open(my $fh, '>', $path) or return 0;
7e0abcec TH	296	print($fh $value);
7e0abcec TH	297	close($fh);
ceb1497a DA	298
ceb1497a DA	299	return 1;
7e0abcec TH	300	}
7e0abcec TH	301
75cd7583 DA	302	sub main
	303	{
	304	# parse command-line options. all unrecognized options and arguments
	305	# are passed through to the 'git diff' command.
c9bdd505 DA	306	my %opts = (
	307	difftool_cmd => undef,
	308	dirdiff => undef,
	309	extcmd => undef,
	310	gui => undef,
	311	help => undef,
	312	prompt => undef,
190f5475 DA	313	symlinks => $^O ne 'cygwin' &&
190f5475 DA	314	$^O ne 'MSWin32' && $^O ne 'msys',
c9bdd505	315	tool_help => undef,
2b52123f	316	trust_exit_code => undef,
c9bdd505 DA	317	);
	318	GetOptions('g\|gui!' => \$opts{gui},
	319	'd\|dir-diff' => \$opts{dirdiff},
	320	'h' => \$opts{help},
	321	'prompt!' => \$opts{prompt},
	322	'y' => sub { $opts{prompt} = 0; },
1f229345 DA	323	'symlinks' => \$opts{symlinks},
1f229345 DA	324	'no-symlinks' => sub { $opts{symlinks} = 0; },
c9bdd505 DA	325	't\|tool:s' => \$opts{difftool_cmd},
c9bdd505 DA	326	'tool-help' => \$opts{tool_help},
2b52123f DA	327	'trust-exit-code' => \$opts{trust_exit_code},
2b52123f DA	328	'no-trust-exit-code' => sub { $opts{trust_exit_code} = 0; },
c9bdd505 DA	329	'x\|extcmd:s' => \$opts{extcmd});
	330
	331	if (defined($opts{help})) {
75cd7583	332	usage(0);
5c38ea31	333	}
c9bdd505	334	if (defined($opts{tool_help})) {
75cd7583	335	print_tool_help();
3f94ff75	336	}
c9bdd505 DA	337	if (defined($opts{difftool_cmd})) {
	338	if (length($opts{difftool_cmd}) > 0) {
	339	$ENV{GIT_DIFF_TOOL} = $opts{difftool_cmd};
75cd7583 DA	340	} else {
	341	print "No <tool> given for --tool=<tool>\n";
	342	usage(1);
	343	}
	344	}
c9bdd505 DA	345	if (defined($opts{extcmd})) {
	346	if (length($opts{extcmd}) > 0) {
	347	$ENV{GIT_DIFFTOOL_EXTCMD} = $opts{extcmd};
75cd7583 DA	348	} else {
	349	print "No <cmd> given for --extcmd=<cmd>\n";
	350	usage(1);
	351	}
	352	}
c9bdd505 DA	353	if ($opts{gui}) {
c9bdd505 DA	354	my $guitool = Git::config('diff.guitool');
af14b5cf	355	if (defined($guitool) && length($guitool) > 0) {
75cd7583 DA	356	$ENV{GIT_DIFF_TOOL} = $guitool;
	357	}
	358	}
	359
2b52123f DA	360	if (!defined $opts{trust_exit_code}) {
	361	$opts{trust_exit_code} = Git::config_bool('difftool.trustExitCode');
	362	}
	363	if ($opts{trust_exit_code}) {
	364	$ENV{GIT_DIFFTOOL_TRUST_EXIT_CODE} = 'true';
	365	} else {
	366	$ENV{GIT_DIFFTOOL_TRUST_EXIT_CODE} = 'false';
	367	}
	368
75cd7583 DA	369	# In directory diff mode, 'git-difftool--helper' is called once
	370	# to compare the a/b directories. In file diff mode, 'git diff'
	371	# will invoke a separate instance of 'git-difftool--helper' for
	372	# each file that changed.
c9bdd505	373	if (defined($opts{dirdiff})) {
1f229345	374	dir_diff($opts{extcmd}, $opts{symlinks});
75cd7583	375	} else {
c9bdd505	376	file_diff($opts{prompt});
3f94ff75 TH	377	}
3f94ff75 TH	378	}
7e0abcec	379
75cd7583 DA	380	sub dir_diff
75cd7583 DA	381	{
1f229345	382	my ($extcmd, $symlinks) = @_;
75cd7583	383	my $rc;
ceb1497a	384	my $error = 0;
75cd7583	385	my $repo = Git->repository();
32b8c581 DA	386	my $repo_path = $repo->repo_path();
	387	my $workdir = $repo->wc_path();
	388	my ($a, $b, $tmpdir, @worktree) = setup_dir_diff($workdir, $symlinks);
ceb1497a	389
7e0abcec TH	390	if (defined($extcmd)) {
7e0abcec TH	391	$rc = system($extcmd, $a, $b);
3f94ff75	392	} else {
7e0abcec TH	393	$ENV{GIT_DIFFTOOL_DIRDIFF} = 'true';
7e0abcec TH	394	$rc = system('git', 'difftool--helper', $a, $b);
d531174f	395	}
7e0abcec TH	396	# If the diff including working copy files and those
7e0abcec TH	397	# files were modified during the diff, then the changes
1f229345 DA	398	# should be copied back to the working tree.
	399	# Do not copy back files when symlinks are used and the
	400	# external tool did not replace the original link with a file.
67aa147a JK	401	#
	402	# These hashes are loaded lazily since they aren't needed
	403	# in the common case of --symlinks and the difftool updating
	404	# files through the symlink.
	405	my %wt_modified;
	406	my %tmp_modified;
	407	my $indices_loaded = 0;
	408
1f229345 DA	409	for my $file (@worktree) {
1f229345 DA	410	next if $symlinks && -l "$b/$file";
283abb2c DA	411	next if ! -f "$b/$file";
283abb2c DA	412
67aa147a	413	if (!$indices_loaded) {
32b8c581 DA	414	%wt_modified = changed_files(
	415	$repo_path, "$tmpdir/wtindex", $workdir);
	416	%tmp_modified = changed_files(
	417	$repo_path, "$tmpdir/wtindex", $b);
67aa147a JK	418	$indices_loaded = 1;
	419	}
	420
	421	if (exists $wt_modified{$file} and exists $tmp_modified{$file}) {
	422	my $errmsg = "warning: Both files modified: ";
	423	$errmsg .= "'$workdir/$file' and '$b/$file'.\n";
	424	$errmsg .= "warning: Working tree file has been left.\n";
	425	$errmsg .= "warning:\n";
283abb2c	426	warn $errmsg;
ceb1497a	427	$error = 1;
67aa147a	428	} elsif (exists $tmp_modified{$file}) {
1f229345	429	my $mode = stat("$b/$file")->mode;
ceb1497a DA	430	copy("$b/$file", "$workdir/$file") or
	431	exit_cleanup($tmpdir, 1);
	432
	433	chmod($mode, "$workdir/$file") or
	434	exit_cleanup($tmpdir, 1);
05df5326	435	}
7e0abcec	436	}
ceb1497a DA	437	if ($error) {
	438	warn "warning: Temporary files exist in '$tmpdir'.\n";
	439	warn "warning: You may want to cleanup or recover these.\n";
	440	exit(1);
	441	} else {
	442	exit_cleanup($tmpdir, $rc);
	443	}
75cd7583 DA	444	}
	445
	446	sub file_diff
	447	{
	448	my ($prompt) = @_;
	449
7e0abcec TH	450	if (defined($prompt)) {
	451	if ($prompt) {
	452	$ENV{GIT_DIFFTOOL_PROMPT} = 'true';
	453	} else {
	454	$ENV{GIT_DIFFTOOL_NO_PROMPT} = 'true';
	455	}
	456	}
	457
	458	$ENV{GIT_PAGER} = '';
	459	$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';
	460
	461	# ActiveState Perl for Win32 does not implement POSIX semantics of
	462	# exec* system call. It just spawns the given executable and finishes
	463	# the starting program, exiting with code 0.
	464	# system will at least catch the errors returned by git diff,
	465	# allowing the caller of git difftool better handling of failures.
	466	my $rc = system('git', 'diff', @ARGV);
	467	exit($rc \| ($rc >> 8));
	468	}
75cd7583 DA	469
75cd7583 DA	470	main();