@matheusbsbs / matheus-bagliano / commits / 78bc403aaf
Fork 0

gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line

Add parsing line of raw combined diff ("git diff-tree -c/-cc" output) as described in section "diff format for merges" in diff-format.txt to parse_difftree_raw_line subroutine. Returned hash (or hashref) has for combined diff 'nparents' key which holds number of parents in a merge. At keys 'from_mode' and 'from_id' there are arrayrefs holding modes and ids, respectively. There is no 'similarity' value, and there is only 'to_file' value and no 'from_file' value. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>

Jakub Narebski committed May 7, 2007 at 01:10 UTC 78bc403aaffe4dc7854da118e977685b38bdc5b7
1 file changed +11
gitweb/gitweb.perl
+11
@@ -1495,6 +1495,17 @@ sub parse_difftree_raw_line {
1495 $res{'file'} = unquote($7);
1496 }
1497 }
1498 + # '::100755 100755 100755 60e79ca1b01bc8b057abe17ddab484699a7f5fdb 94067cc5f73388f33722d52ae02f44692bc07490 94067cc5f73388f33722d52ae02f44692bc07490 MR git-gui/git-gui.sh'
1499 + # combined diff (for merge commit)
1500 + elsif ($line =~ s/^(::+)((?:[0-7]{6} )+)((?:[0-9a-fA-F]{40} )+)([a-zA-Z]+)\t(.*)$//) {
1501 + $res{'nparents'} = length($1);
1502 + $res{'from_mode'} = [ split(' ', $2) ];
1503 + $res{'to_mode'} = pop @{$res{'from_mode'}};
1504 + $res{'from_id'} = [ split(' ', $3) ];
1505 + $res{'to_id'} = pop @{$res{'from_id'}};
1506 + $res{'status'} = [ split('', $4) ];
1507 + $res{'to_file'} = unquote($5);
1508 + }
1509 # 'c512b523472485aef4fff9e57b229d9d243c967f'
1510 elsif ($line =~ m/^([0-9a-fA-F]{40})$/) {
1511 $res{'commit'} = $1;