{"thread":{"id":"28698","subject":"[PATCH/RFC] gitweb: add the ability to show side-by-side diff on commitdiff.","startedAt":"2011-10-16T23:57:31Z","lastAt":"2011-10-17T03:57:52Z","messageCount":6,"participants":["Kato Kazuyoshi","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"177811","messageId":"CAFo4x0Kb651CyxoP8wxR36aDe5=Md2UV3qjh+HPo4ad6NB=Emg@mail.gmail.com","threadId":"28698","inReplyTo":null,"subject":"[PATCH/RFC] gitweb: add the ability to show side-by-side diff on commitdiff.","fromName":"Kato Kazuyoshi","fromEmail":"kato.kazuyoshi@gmail.com","sentAt":"2011-10-16T23:57:31Z","receivedAt":"2011-10-16T23:57:31Z","isPatch":true,"sender":{"key":"kato.kazuyoshi@gmail.com","avatar":"https://avatars.githubusercontent.com/u/19111?v=4"},"body":"---\nHello,\n\nI want to add some features that provided by Trac to Gitweb.\nFirst, I've implemented \"side-by-side\" style diff.\n\n gitweb/gitweb.perl | 97 ++++++++++++++++++++++++++++++++++++++--------\n gitweb/static/gitweb.css | 16 ++++++++\n 2 files changed, 96 insertions(+), 17 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 85d64b2..9d7609f 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -757,6 +757,7 @@ our @cgi_param_mapping = (\n \textra_options => \"opt\",\n \tsearch_use_regexp => \"sr\",\n \tctag => \"by_tag\",\n+\tdiff_style => \"ds\",\n \t# this must be last entry (for manipulation from JavaScript)\n \tjavascript => \"js\"\n );\n@@ -1072,6 +1073,8 @@ sub evaluate_and_validate_params {\n \t\t}\n \t\t$search_regexp = $search_use_regexp ? $searchtext : quotemeta $searchtext;\n \t}\n+\n+\t$input_params{diff_style} ||= 'inline';\n }\n\n # path to the current git repository\n@@ -2235,25 +2238,25 @@ sub format_diff_line {\n \t\t# combined diff\n \t\tmy $prefix = substr($line, 0, scalar @{$from->{'href'}});\n \t\tif ($line =~ m/^\\@{3}/) {\n-\t\t\t$diff_class = \" chunk_header\";\n+\t\t\t$diff_class = \"chunk_header\";\n \t\t} elsif ($line =~ m/^\\\\/) {\n-\t\t\t$diff_class = \" incomplete\";\n+\t\t\t$diff_class = \"incomplete\";\n \t\t} elsif ($prefix =~ tr/+/+/) {\n-\t\t\t$diff_class = \" add\";\n+\t\t\t$diff_class = \"add\";\n \t\t} elsif ($prefix =~ tr/-/-/) {\n-\t\t\t$diff_class = \" rem\";\n+\t\t\t$diff_class = \"rem\";\n \t\t}\n \t} else {\n \t\t# assume ordinary diff\n \t\tmy $char = substr($line, 0, 1);\n \t\tif ($char eq '+') {\n-\t\t\t$diff_class = \" add\";\n+\t\t\t$diff_class = \"add\";\n \t\t} elsif ($char eq '-') {\n-\t\t\t$diff_class = \" rem\";\n+\t\t\t$diff_class = \"rem\";\n \t\t} elsif ($char eq '@') {\n-\t\t\t$diff_class = \" chunk_header\";\n+\t\t\t$diff_class = \"chunk_header\";\n \t\t} elsif ($char eq \"\\\\\") {\n-\t\t\t$diff_class = \" incomplete\";\n+\t\t\t$diff_class = \"incomplete\";\n \t\t}\n \t}\n \t$line = untabify($line);\n@@ -2274,7 +2277,7 @@ sub format_diff_line {\n \t\t}\n \t\t$line = \"@@ $from_text $to_text @@\" .\n \t\t \"\" . esc_html($section, -nbsp=>1) .\n\"\";\n-\t\treturn \"$line
\\n\";\n+\t\treturn $diff_class, \"$line
\\n\";\n \t} elsif ($from && $to && $line =~ m/^\\@{3}/) {\n \t\tmy ($prefix, $ranges, $section) = $line =~ m/^(\\@+) (.*?) \\@+(.*)$/;\n \t\tmy (@from_text, @from_start, @from_nlines, $to_text, $to_start, $to_nlines);\n@@ -2307,9 +2310,9 @@ sub format_diff_line {\n \t\t}\n \t\t$line .= \" $prefix\" .\n \t\t \"\" . esc_html($section, -nbsp=>1)\n. \"\";\n-\t\treturn \"$line
\\n\";\n+\t\treturn $diff_class, \"$line
\\n\";\n \t}\n-\treturn \"\" . esc_html($line, -nbsp=>1)\n. \"
\\n\";\n+\treturn $diff_class, \"\" .\nesc_html($line, -nbsp=>1) . \"
\\n\";\n }\n\n # Generates undef or something like \"_snapshot_\" or \"snapshot (_tbz2_ _zip_)\",\n@@ -4826,8 +4829,32 @@ sub git_difftree_body {\n \tprint \"\\n\";\n }\n\n+sub format_diff_chunk {\n+\tmy @chunk = @_;\n+\n+\tmy $first_class = $chunk[0]->[0];\n+\tmy @partial = map { $_->[1] } grep { $_->[0] eq $first_class } @chunk;\n+\n+\tif (scalar @partial < scalar @chunk) {\n+\t\treturn join '', (\"\",\n+\t\t @partial,\n+\t\t \"
\",\n+\t\t \"
\",\n+\t\t (map {\n+\t\t $_->[1];\n+\t\t } @chunk[scalar @partial..scalar @chunk-1]),\n+\t\t \"
\",\n+\t\t @partial,\n+\t\t \"
},\n+\t\t\t\t\t $line,\n+\t\t\t\t\t q{
},\n+\t\t\t\t\t $line,\n+\t\t\t\t\t q{
$formats_nav
\\n\";\n@@ -7051,7 +7097,7 @@ sub git_blobdiff {\n \tif ($format eq 'html') {\n \t\tprint \"\\n\";\n\n-\t\tgit_patchset_body($fd, [ \\%diffinfo ], $hash_base, $hash_parent_base);\n+\t\tgit_patchset_body($fd, $input_params{diff_style} eq 'inline', [\n\\%diffinfo ], $hash_base, $hash_parent_base);\n \t\tclose $fd;\n\n \t\tprint \"
\\n\"; # class=\"page_body\"\n@@ -7076,6 +7122,22 @@ sub git_blobdiff_plain {\n \tgit_blobdiff('plain');\n }\n\n+sub diff_nav {\n+\tmy ($style) = @_;\n+\n+\tmy %pairs = (inline => 'inline', 'sidebyside' => 'side by side');\n+\tjoin '', ($cgi->start_form({ method => 'get' }),\n+\t $cgi->hidden('p'),\n+\t $cgi->hidden('a'),\n+\t $cgi->hidden('h'),\n+\t $cgi->hidden('hp'),\n+\t $cgi->hidden('hb'),\n+\t $cgi->hidden('hpb'),\n+\t $cgi->popup_menu('ds', [keys %pairs], $style, \\%pairs),\n+\t $cgi->submit('change'),\n+\t $cgi->end_form);\n+}\n+\n sub git_commitdiff {\n \tmy %params = @_;\n \tmy $format = $params{-format} || 'html';\n@@ -7228,7 +7290,7 @@ sub git_commitdiff {\n \t\tmy $ref = format_ref_marker($refs, $co{'id'});\n\n \t\tgit_header_html(undef, $expires);\n-\t\tgit_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash, $formats_nav);\n+\t\tgit_print_page_nav('commitdiff','', $hash,$co{'tree'},$hash,\n$formats_nav . diff_nav($input_params{diff_style}));\n \t\tgit_print_header_div('commit', esc_html($co{'title'}) . $ref, $hash);\n \t\tprint \"\\n\" .\n \t\t \"