[PATCH v3 8/9] difftool: teach dir-diff to copy modified files back to working tree

From: Tim Henigan <tim.henigan@gmail.com>
Date: Mar 21, 2012, 19:35 UTC
Message-ID: <1332358560-13774-3-git-send-email-tim.henigan@gmail.com>
In-Reply-To: <1332358560-13774-1-git-send-email-tim.henigan@gmail.com>

If the user runs a diff when there are modified files in the working copy, they expect to be able to be edit the files in the diff viewer and save the changes. When using difftool in file mode (i.e. diffing one file at a time), this works as expected. However, when using difftool in directory diff mode, the changes are not saved.

This commit teaches the directory diff mode to copy changes from the diff viewer back to the working copy.

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---

This replaces patch 8/9 in v2 of the series.

Changed in v3
  - Replaced calls to '$repo->wc_path()' with '$repo->repo_path() . "/.."'
    so that paths are properly handled when 'difftool --dir-diff' is
    called from a subdirectory of the repo.

 git-difftool.perl |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/git-difftool.perl b/git-difftool.perl
index 082e887..9201b89 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -22,6 +22,8 @@ use File::Temp qw(tempdir);
 use Getopt::Long qw(:config pass_through);
 use Git;
 
+my @working_tree;
+
 sub usage
 {
 	my $exitcode = shift;
@@ -54,7 +56,6 @@ sub setup_dir_diff
 	my $null_sha1 = 0 x 40;
 	my $lindex = "";
 	my $rindex = "";
-	my @working_tree;
 	my %submodule;
 	my @rawdiff = split('\0', $diffrtn);
 
@@ -98,7 +99,7 @@ sub setup_dir_diff
 
 	# Changes in the working tree need special treatment since they are
 	# not part of the index
-	my $workdir = $repo->wc_path();
+	my $workdir = $repo->repo_path() . "/..";
 	for (@working_tree) {
 		my $dir = dirname($_);
 		unless (-d "$rdir/$dir") {
@@ -179,9 +180,16 @@ if (defined($dirdiff)) {
 			Git::command_noisy(('difftool--helper', $a, $b))
 		} 'exit code %d';
 	}
-	# TODO: if the diff including working copy files and those
+
+	# 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
+	my $repo = Git->repository();
+	my $workdir = $repo->repo_path() . "/..";
+	for (@working_tree) {
+		copy("$b/$_", "$workdir/$_") or die $!;
+		chmod(stat("$b/$_")->mode, "$workdir/$_") or die $!;
+	}
 } else {
 	if (defined($prompt)) {
 		$ENV{GIT_DIFFTOOL_PROMPT} = 'true';

-- 
1.7.10.rc1.39.g6e141f