From: Luben Tuikov <ltuikov@yahoo•com>
To: Jakub Narebski <jnareb@gmail•com>, git@vger•kernel.org
Cc: Jakub Narebski <jnareb@gmail•com>
Subject: Re: [PATCH] gitweb: Fix git_patchset_body not closing <div class="patch">
Date: Tue, 9 Jan 2007 15:35:31 -0800 (PST) [thread overview]
Message-ID: <189181.35429.qm@web31811.mail.mud.yahoo.com> (raw)
In-Reply-To: <11683840631010-git-send-email-jnareb@gmail.com>
--- Jakub Narebski <jnareb@gmail•com> wrote:
> Fix case when git_patchset_body didn't close <div class="patch">,
> for patchsets with last patch empty.
>
> perlsyn(1):
> The "last" command immediately exits the loop in question.
> The "continue" block, if any, is not executed.
>
> Remove some commented out code in git_patchset_body.
>
> Signed-off-by: Jakub Narebski <jnareb@gmail•com>
Acked-by: Luben Tuikov <ltuikov@yahoo•com>
This patch fixes it.
Luben
> ---
>
> Luben Tuikov wrote:
> > --- Jakub Narebski <jnareb@gmail•com> wrote:
> >> Jakub Narebski wrote:
> >>> Luben Tuikov wrote:
> >>>
> >>>> Ok, I see that Junio has committed the fixes to "next" -- thanks!
> >>>> That saved me time having to manually apply them.
> >>>>
> >>>> Now, the results are that I see the same bug.
> >>>
> >>> (The same bug = no closing div).
> >>>
> >>> I'll try to reproduce this.
> >>
> >> I failed to reproduce this error.
> >>
> >> Could you apply the following patch, and report the result of
> >> grep "</div>\|<div" | grep -v "<div.*</div>
> >> (find all opening and closing <div> elements, but omitting
> >> those which are opened and closed in the same line)?
>
> [...]
> > <div class="patchset">
> > <div class="patch" id="patch1">
> > <div class="diff extended_header">
> > </div><!-- diff extended_header -->
> > </div><!-- patch 0 -->
> > <div class="patch" id="patch2">
> > <div class="diff extended_header">
> > </div><!-- diff extended_header -->
> > </div><!-- patchset -->
> [...]
> > The bug is clear.
>
> Oops. I'm bit new to Perl.
>
> This should fix it.
>
> gitweb/gitweb.perl | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 25e5079..88af2e6 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -2412,7 +2412,6 @@ sub git_patchset_body {
>
> push @diff_header, $patch_line;
> }
> - #last PATCH unless $patch_line;
> my $last_patch_line = $patch_line;
>
> # check if current patch belong to current raw line
> @@ -2522,7 +2521,10 @@ sub git_patchset_body {
>
> # from-file/to-file diff header
> $patch_line = $last_patch_line;
> - last PATCH unless $patch_line;
> + if (! $patch_line) {
> + print "</div>\n"; # class="patch"
> + last PATCH;
> + }
> next PATCH if ($patch_line =~ m/^diff /);
> #assert($patch_line =~ m/^---/) if DEBUG;
> if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {
> @@ -2533,7 +2535,6 @@ sub git_patchset_body {
> print "<div class=\"diff from_file\">$patch_line</div>\n";
>
> $patch_line = <$fd>;
> - #last PATCH unless $patch_line;
> chomp $patch_line;
>
> #assert($patch_line =~ m/^+++/) if DEBUG;
> --
> 1.4.4.3
>
>
next prev parent reply other threads:[~2007-01-09 23:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-05 1:29 Bugs in gitweb Luben Tuikov
2007-01-07 1:52 ` [PATCH 0/5] gitweb: git_patchset_body fixes Jakub Narebski
2007-01-08 3:50 ` Luben Tuikov
2007-01-08 9:03 ` Jakub Narebski
2007-01-09 4:25 ` Luben Tuikov
2007-01-09 10:27 ` Jakub Narebski
2007-01-09 16:44 ` Jakub Narebski
2007-01-09 21:38 ` Luben Tuikov
2007-01-09 23:07 ` [PATCH] gitweb: Fix git_patchset_body not closing <div class="patch"> Jakub Narebski
2007-01-09 23:35 ` Luben Tuikov [this message]
2007-01-09 20:54 ` [PATCH 0/5] gitweb: git_patchset_body fixes Luben Tuikov
2007-01-07 1:52 ` [PATCH 1/5] gitweb: Fix error in git_patchest_body for file creation/deletion patch Jakub Narebski
2007-01-08 3:53 ` Luben Tuikov
2007-01-07 1:52 ` [PATCH 2/5] gitweb: Fix error in "rename to"/"copy to" git diff header output Jakub Narebski
2007-01-07 1:52 ` [PATCH 3/5] gitweb: Fix errors in git_patchset_body for empty patches Jakub Narebski
2007-01-07 1:52 ` [PATCH 4/5] Revert "gitweb: There can be empty patches (in git_patchset_body)" Jakub Narebski
2007-01-07 1:52 ` [PATCH 5/5] gitweb: Fix split patches output (e.g. file to symlink) 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=189181.35429.qm@web31811.mail.mud.yahoo.com \
--to=ltuikov@yahoo$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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