From: Yasushi SHOJI <yashi@atmark-techno.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: gitweb - option to disable rename detection
Date: Tue, 16 Aug 2005 05:48:15 +0900 [thread overview]
Message-ID: <87br3zorjk.wl@mail2.atmark-techno.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0508151140050.3553@g5.osdl.org>
At Mon, 15 Aug 2005 11:53:20 -0700 (PDT),
Linus Torvalds wrote:
>
> On Tue, 16 Aug 2005, Yasushi SHOJI wrote:
> >
> > It seems to me that git-diff-tree needs huge memory if you try to diff
> > on big change with rename detection enabled.
> >
> > This isn't problem for sane project but if you create a repo with only
> > major releases imports, git-diff-tree run by git_commit() eats system
> > memory and die ;P
>
> Instead of disabling it entirely, how about just having some limit on it?
ah, that's a good idea. here is a quick and dirty patch.
--
yashi
diff --git a/gitweb.cgi b/gitweb.cgi
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -40,6 +40,9 @@ my $home_text = "indextext.html";
#my $projects_list = $projectroot;
my $projects_list = "index/index.aux";
+# max number of changes to use rename detection on git-diff-tree
+my $rename_detection_threshold = 1000;
+
# input validation and dispatch
my $action = $cgi->param('a');
if (defined $action) {
@@ -1587,7 +1590,18 @@ sub git_commit {
$root = " --root";
$parent = "";
}
- open my $fd, "-|", "$gitbin/git-diff-tree -r -M $root $parent $hash" or die_error(undef, "Open failed.");
+ my $nr_files;
+ my $opts = "";
+ my $disabled_notice;
+ open my $fd, "-|", "$gitbin/git-diff-tree -r $root $parent $hash" or die_error(undef, "Open failed.");
+ $nr_files++ while <$fd>;
+ close $fd or die_error(undef, "Counting diff-tree failed.");
+ if ($nr_files < $rename_detection_threshold) {
+ $opts .= " -M";
+ } else {
+ $disabled_notice = "(Rename detection disabled)";
+ }
+ open my $fd, "-|", "$gitbin/git-diff-tree -r $opts $root $parent $hash" or die_error(undef, "Open failed.");
@difftree = map { chomp; $_ } <$fd>;
close $fd or die_error(undef, "Reading diff-tree failed.");
git_header_html();
@@ -1671,7 +1685,7 @@ sub git_commit {
print "</div>\n";
print "<div class=\"list_head\">\n";
if ($#difftree > 10) {
- print(($#difftree + 1) . " files changed:\n");
+ print(($#difftree + 1) . " files changed" . $disabled_notice . ":\n");
}
print "</div>\n";
print "<table cellspacing=\"0\">\n";
next prev parent reply other threads:[~2005-08-15 20:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-15 18:31 gitweb - option to disable rename detection Yasushi SHOJI
2005-08-15 18:53 ` Linus Torvalds
2005-08-15 20:48 ` Yasushi SHOJI [this message]
2005-08-15 22:43 ` Linus Torvalds
2005-08-16 1:21 ` Junio C Hamano
2005-08-16 23:14 ` Yasushi SHOJI
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=87br3zorjk.wl@mail2.atmark-techno.com \
--to=yashi@atmark-techno.com \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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).