From: Jonathan Nieder <jrnieder@gmail.com>
To: Erick Mattos <erick.mattos@gmail.com>
Cc: git@vger.kernel.org, Jakub Narebski <jnareb@gmail.com>,
Pavan Kumar Sunkara <pavan.sss1991@gmail.com>,
Petr Baudis <pasky@suse.cz>,
John 'Warthog9' Hawley <warthog9@kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3] gitweb: clarify search results page when no matching commit found
Date: Sat, 7 Aug 2010 16:56:47 -0500 [thread overview]
Message-ID: <20100807215647.GB2969@burratino> (raw)
In-Reply-To: <AANLkTikiVQCMKjftWfrKbK-K+Gv45CTunxjULGc1==Zb@mail.gmail.com>
When searching commits for a string that never occurs, the results
page looks something like this:
projects / foo.git / search \o/
summary | ... | tree [commit] search: [ kfjdkas ] [ ]re
first ⋅ prev ⋅ next
Merge branch 'maint'
Foo: a demonstration project
Without a list of hits to compare it to, the header describing the
commit named by the hash parameter (usually HEAD) may itself look
like a hit. Add some text (“No match.”) to replace the empty
list of hits and avoid this confusion.
While at it, remove some nearby dead code, left behind from a
simplification a few years ago (v1.5.4-rc0~276^2~4, 2007-11-01).
Noticed-by: Erick Mattos <erick.mattos@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
---
changes relative to v2[1]:
- better newline placement in the produced HTML.
Erick Mattos wrote:
> What's up to:
>
> http://thread.gmane.org/gmane.comp.version-control.git/151402/focus=151414
Hopefully third time’s the charm. Test reports welcome as always.
gitweb/gitweb.perl | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 8b02767..4efeebc 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -6521,12 +6521,13 @@ sub git_search {
$paging_nav .= " ⋅ next";
}
- if ($#commitlist >= 100) {
- }
-
git_print_page_nav('','', $hash,$co{'tree'},$hash, $paging_nav);
git_print_header_div('commit', esc_html($co{'title'}), $hash);
- git_search_grep_body(\@commitlist, 0, 99, $next_link);
+ if ($page == 0 && !@commitlist) {
+ print "<p>No match.</p>\n";
+ } else {
+ git_search_grep_body(\@commitlist, 0, 99, $next_link);
+ }
}
if ($searchtype eq 'pickaxe') {
--
1.7.2.1.544.ga752d.dirty
next prev parent reply other threads:[~2010-08-07 21:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-07 21:47 Lost in Space Erick Mattos
2010-08-07 21:56 ` Jonathan Nieder [this message]
2010-08-17 22:42 ` Erick Mattos
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=20100807215647.GB2969@burratino \
--to=jrnieder@gmail.com \
--cc=erick.mattos@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=pasky@suse.cz \
--cc=pavan.sss1991@gmail.com \
--cc=warthog9@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).