From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 18/19] gitweb: Remove git_diff_print subroutine
Date: Fri, 25 Aug 2006 21:15:27 +0200 [thread overview]
Message-ID: <200608252115.27881.jnareb@gmail.com> (raw)
In-Reply-To: <200608240015.15071.jnareb@gmail.com>
Remove git_diff_print subroutine, used to print diff in previous
versions of "diff" actions, namely git_commitdiff,
git_commitdiff_plain, git_blobdiff, git_blobdiff_plain.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
gitweb/gitweb.perl | 71 ----------------------------------------------------
1 files changed, 0 insertions(+), 71 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index b20640e..2f932f0 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1975,77 +1975,6 @@ sub git_heads_body {
print "</table>\n";
}
-## ----------------------------------------------------------------------
-## functions printing large fragments, format as one of arguments
-
-sub git_diff_print {
- my $from = shift;
- my $from_name = shift;
- my $to = shift;
- my $to_name = shift;
- my $format = shift || "html";
-
- my $from_tmp = "/dev/null";
- my $to_tmp = "/dev/null";
- my $pid = $$;
-
- # create tmp from-file
- if (defined $from) {
- $from_tmp = "$git_temp/gitweb_" . $$ . "_from";
- open my $fd2, "> $from_tmp";
- open my $fd, "-|", $GIT, "cat-file", "blob", $from;
- my @file = <$fd>;
- print $fd2 @file;
- close $fd2;
- close $fd;
- }
-
- # create tmp to-file
- if (defined $to) {
- $to_tmp = "$git_temp/gitweb_" . $$ . "_to";
- open my $fd2, "> $to_tmp";
- open my $fd, "-|", $GIT, "cat-file", "blob", $to;
- my @file = <$fd>;
- print $fd2 @file;
- close $fd2;
- close $fd;
- }
-
- open my $fd, "-|", "/usr/bin/diff -u -p -L \'$from_name\' -L \'$to_name\' $from_tmp $to_tmp";
- if ($format eq "plain") {
- undef $/;
- print <$fd>;
- $/ = "\n";
- } else {
- while (my $line = <$fd>) {
- chomp $line;
- my $char = substr($line, 0, 1);
- my $diff_class = "";
- if ($char eq '+') {
- $diff_class = " add";
- } elsif ($char eq "-") {
- $diff_class = " rem";
- } elsif ($char eq "@") {
- $diff_class = " chunk_header";
- } elsif ($char eq "\\") {
- # skip errors
- next;
- }
- $line = untabify($line);
- print "<div class=\"diff$diff_class\">" . esc_html($line) . "</div>\n";
- }
- }
- close $fd;
-
- if (defined $from) {
- unlink($from_tmp);
- }
- if (defined $to) {
- unlink($to_tmp);
- }
-}
-
-
## ======================================================================
## ======================================================================
## actions
--
1.4.1.1
next prev parent reply other threads:[~2006-08-25 19:35 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-23 22:15 [PATCH/RFC 1/x] gitweb: Use git-diff-tree patch output for commitdiff Jakub Narebski
2006-08-23 23:58 ` [PATCH 2] gitweb: Replace git_commitdiff_plain by anonymous subroutine Jakub Narebski
2006-08-23 23:58 ` [PATCH 3] gitweb: Show information about incomplete lines in commitdiff Jakub Narebski
2006-08-24 2:21 ` Junio C Hamano
2006-08-24 11:12 ` Jakub Narebski
2006-08-24 2:15 ` [PATCH/RFC 1/x] gitweb: Use git-diff-tree patch output for commitdiff Junio C Hamano
2006-08-24 11:10 ` Jakub Narebski
2006-08-24 18:45 ` Junio C Hamano
2006-08-24 18:56 ` Jakub Narebski
2006-08-25 17:32 ` Marco Costalba
2006-08-25 18:18 ` Jakub Narebski
2006-08-24 17:32 ` [PATCH 4] gitweb: Remove invalid comment in format_diff_line Jakub Narebski
2006-08-24 17:34 ` [PATCH 5] gitweb: Streamify patch output in git_commitdiff Jakub Narebski
2006-08-24 17:37 ` [PATCH 6] gitweb: Add git_get_{following,preceding}_references functions Jakub Narebski
2006-08-24 17:39 ` [PATCH 7] gitweb: Faster return from git_get_preceding_references if possible Jakub Narebski
2006-08-24 17:41 ` [PATCH 8] gitweb: Add git_get_rev_name_tags function Jakub Narebski
2006-08-24 17:45 ` [PATCH 9] gitweb: Use git_get_name_rev_tags for commitdiff_plain X-Git-Tag: header Jakub Narebski
2006-08-24 18:50 ` [PATCH 10] gitweb: Add support for hash_parent_base parameter for blobdiffs Jakub Narebski
2006-08-24 21:53 ` [PATCH 10 (amended)] " Jakub Narebski
2006-08-25 18:59 ` [PATCH 11/19] gitweb: Allow for pre-parsed difftree info in git_patchset_body Jakub Narebski
2006-08-25 19:04 ` [PATCH 12/19] gitweb: Parse two-line from-file/to-file diff header " Jakub Narebski
2006-08-25 19:05 ` [PATCH 13/19] gitweb: Add invisible hyperlink to from-file/to-file diff header Jakub Narebski
2006-08-27 3:38 ` Linus Torvalds
2006-08-25 19:05 ` [PATCH 14/19] gitweb: Always display link to blobdiff_plain in git_blobdiff Jakub Narebski
2006-08-25 19:06 ` [PATCH 15/19] gitweb: Change here-doc back for style consistency " Jakub Narebski
2006-08-25 19:13 ` [PATCH 16/19] gitweb: Use git-diff-tree or git-diff patch output for blobdiff Jakub Narebski
2006-08-26 9:23 ` Jakub Narebski
2006-08-26 10:14 ` Junio C Hamano
2006-08-26 10:17 ` Jakub Narebski
2006-08-26 10:33 ` [PATCH 16a/19] gitweb: Remove workaround for git-diff bug fixed in f82cd3c Jakub Narebski
2006-08-25 19:14 ` [PATCH 17/19] gitweb: git_blobdiff_plain is git_blobdiff('plain') Jakub Narebski
2006-08-25 19:15 ` Jakub Narebski [this message]
2006-08-25 19:35 ` [PATCH 19/19] gitweb: Remove creating directory for temporary files Jakub Narebski
2006-08-25 21:33 ` Marco Costalba
2006-08-25 21:48 ` Jakub Narebski
2006-08-26 2:05 ` Junio C Hamano
2006-08-26 4:44 ` Marco Costalba
2006-08-26 5:13 ` Junio C Hamano
2006-08-26 5:34 ` Marco Costalba
2006-08-26 5:43 ` Marco Costalba
2006-08-26 5:40 ` Mozilla import and large history Shawn Pearce
2006-08-26 0:26 ` [PATCH 19/19] gitweb: Remove creating directory for temporary files Josef Weidendorfer
2006-08-26 0:46 ` Jakub Narebski
2006-08-26 19:25 ` Junio C Hamano
2006-08-26 20:18 ` Jakub Narebski
2006-08-27 2:51 ` Junio C Hamano
2006-08-27 0:24 ` Junio C Hamano
2006-08-27 0:38 ` Jakub Narebski
2006-08-25 21:15 ` [PATCH 00/19] gitweb: Remove dependency on external diff and need " Jakub Narebski
2006-08-27 3:30 ` Linus Torvalds
2006-08-27 3:42 ` David Miller
2006-08-27 3:54 ` Linus Torvalds
2006-08-27 15:37 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200608252115.27881.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).