git stash: Give friendlier errors when there is nothing to apply

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 4d7e4ff7a08694635f493d4910ffaa5da792e8e4..9d66bc61a4f8367ac54e438d56fea6c18abdf8ac 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -94,7 +94,7 @@ BEGIN
 # URI and label (title) of GIT logo link
 #our $logo_url = "http://www.kernel.org/pub/software/scm/git/docs/";
 #our $logo_label = "git documentation";
-our $logo_url = "http://git.or.cz/";
+our $logo_url = "http://git-scm.com/";
 our $logo_label = "git homepage";
 
 # source of projects list
@@ -378,15 +378,18 @@ BEGIN
        # shortlog or commit will display an avatar associated with
        # the email of the committer(s) and/or author(s).
 
-       # Currently only the gravatar provider is available, and it
-       # depends on Digest::MD5. If an unknown provider is specified,
-       # the feature is disabled.
+       # Currently available providers are gravatar and picon.
+       # If an unknown provider is specified, the feature is disabled.
+
+       # Gravatar depends on Digest::MD5.
+       # Picon currently relies on the indiana.edu database.
 
        # To enable system wide have in $GITWEB_CONFIG
-       # $feature{'avatar'}{'default'} = ['gravatar'];
+       # $feature{'avatar'}{'default'} = ['<provider>'];
+       # where <provider> is either gravatar or picon.
        # To have project specific config enable override in $GITWEB_CONFIG
        # $feature{'avatar'}{'override'} = 1;
-       # and in project config gitweb.avatar = gravatar;
+       # and in project config gitweb.avatar = <provider>;
        'avatar' => {
                'sub' => \&feature_avatar,
                'override' => 0,
@@ -853,6 +856,8 @@ sub evaluate_path_info {
 our ($git_avatar) = gitweb_get_feature('avatar');
 if ($git_avatar eq 'gravatar') {
        $git_avatar = '' unless (eval { require Digest::MD5; 1; });
+} elsif ($git_avatar eq 'picon') {
+       # no dependencies
 } else {
        $git_avatar = '';
 }
@@ -935,10 +940,13 @@ sub href {
                        if (defined $params{'hash_parent_base'}) {
                                $href .= esc_url($params{'hash_parent_base'});
                                # skip the file_parent if it's the same as the file_name
-                               delete $params{'file_parent'} if $params{'file_parent'} eq $params{'file_name'};
-                               if (defined $params{'file_parent'} && $params{'file_parent'} !~ /\.\./) {
-                                       $href .= ":/".esc_url($params{'file_parent'});
-                                       delete $params{'file_parent'};
+                               if (defined $params{'file_parent'}) {
+                                       if (defined $params{'file_name'} && $params{'file_parent'} eq $params{'file_name'}) {
+                                               delete $params{'file_parent'};
+                                       } elsif ($params{'file_parent'} !~ /\.\./) {
+                                               $href .= ":/".esc_url($params{'file_parent'});
+                                               delete $params{'file_parent'};
+                                       }
                                }
                                $href .= "..";
                                delete $params{'hash_parent'};
@@ -1520,6 +1528,20 @@ sub format_subject_html {
 # given page, there's no risk for cache conflicts.
 our %avatar_cache = ();
 
+# Compute the picon url for a given email, by using the picon search service over at
+# http://www.cs.indiana.edu/picons/search.html
+sub picon_url {
+       my $email = lc shift;
+       if (!$avatar_cache{$email}) {
+               my ($user, $domain) = split('@', $email);
+               $avatar_cache{$email} =
+                       "http://www.cs.indiana.edu/cgi-pub/kinzler/piconsearch.cgi/" .
+                       "$domain/$user/" .
+                       "users+domains+unknown/up/single";
+       }
+       return $avatar_cache{$email};
+}
+
 # Compute the gravatar url for a given email, if it's not in the cache already.
 # Gravatar stores only the part of the URL before the size, since that's the
 # one computationally more expensive. This also allows reuse of the cache for
@@ -1544,9 +1566,10 @@ sub git_get_avatar {
        my $url = "";
        if ($git_avatar eq 'gravatar') {
                $url = gravatar_url($email, $size);
+       } elsif ($git_avatar eq 'picon') {
+               $url = picon_url($email);
        }
-       # Currently only gravatars are supported, but other forms such as
-       # picons can be added by putting an else up here and defining $url
+       # Other providers can be added by extending the if chain, defining $url
        # as needed. If no variant puts something in $url, we assume avatars
        # are completely disabled/unavailable.
        if ($url) {
@@ -1554,6 +1577,7 @@ sub git_get_avatar {
                       "<img width=\"$size\" " .
                            "class=\"avatar\" " .
                            "src=\"$url\" " .
+                           "alt=\"\" " .
                       "/>" . $post_white;
        } else {
                return "";
@@ -2549,7 +2573,7 @@ sub parse_commit_text {
                } elsif ((!defined $withparents) && ($line =~ m/^parent ([0-9a-fA-F]{40})$/)) {
                        push @parents, $1;
                } elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
-                       $co{'author'} = $1;
+                       $co{'author'} = to_utf8($1);
                        $co{'author_epoch'} = $2;
                        $co{'author_tz'} = $3;
                        if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) {
@@ -2559,10 +2583,9 @@ sub parse_commit_text {
                                $co{'author_name'} = $co{'author'};
                        }
                } elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
-                       $co{'committer'} = $1;
+                       $co{'committer'} = to_utf8($1);
                        $co{'committer_epoch'} = $2;
                        $co{'committer_tz'} = $3;
-                       $co{'committer_name'} = $co{'committer'};
                        if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) {
                                $co{'committer_name'}  = $1;
                                $co{'committer_email'} = $2;