diff options
Diffstat (limited to 'vcx')
| -rw-r--r-- | vcx | 30 |
1 files changed, 17 insertions, 13 deletions
@@ -191,22 +191,10 @@ sub run_add { return if compare($_, $obj_in_head) == 0; } - # Generate deltas if modified my $obj_name = sha1_hex($rel); my $obj_path = File::Spec->catfile(OBJ_DIR, $obj_name); - if (-e $obj_path) { - my $p_path = File::Spec->catfile(TMP_DIFF, "$obj_name.patch"); - if (-T $_) { - if (compare($_, $obj_path) != 0) { - unless (-d TMP_DIFF) { make_path(TMP_DIFF); } - system("diff -u '$obj_path' '$_' > '$p_path'"); - } - } else { - make_bin_patch($_, $obj_path, $p_path); - } - } - + make_patch($File::Find::name, $obj_name, $obj_path); stage_file($File::Find::name, $obj_path, $staged_path); print $afh "$rel\n"; # Record in meta file for the commit command } @@ -425,6 +413,22 @@ sub stage_deletions { }, $search); } +sub make_patch { + my ($src, $obj_name, $obj_path) = @_; + + if (-e $obj_path) { + my $p_path = File::Spec->catfile(TMP_DIFF, "$obj_name.patch"); + if (-T $src) { + if (compare($src, $obj_path) != 0) { + unless (-d TMP_DIFF) { make_path(TMP_DIFF); } + system("diff -u '$obj_path' '$src' > '$p_path'"); + } + } else { + make_bin_patch($src, $obj_path, $p_path); + } + } +} + sub make_bin_patch { my ($new_file, $old_file, $patch_out) = @_; |