Andrew's git / gitweb.git / diff
?
Merge branch 'jc/web-blame'
authorJunio C Hamano <junkio@cox.net>
Wed, 25 Oct 2006 20:18:06 +0000 (13:18 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 25 Oct 2006 20:18:06 +0000 (13:18 -0700)
* jc/web-blame:
gitweb: spell "blame --porcelain" with -p
blame: Document and add help text for -f, -n, and -p
gitweb: blame porcelain: lineno and orig lineno swapped
Remove git-annotate.perl and create a builtin-alias for git-blame
gitweb: use blame --porcelain
git-blame --porcelain
blame.c: move code to output metainfo into a separate function.
git-blame: --show-number (and -n)
git-blame: --show-name (and -f)
blame.c: whitespace and formatting clean-up.
Gitweb - provide site headers and footers
gitweb: blame: Mouse-over commit-8 shows author and date
gitweb: blame: print commit-8 on the leading row of a commit-block
Revert 954a6183756a073723a7c9fd8d2feb13132876b0
gitweb: prepare for repositories with packed refs.
gitweb: make leftmost column of blame less cluttered.

1  2 
Makefile patch | diff1 | diff2 | blob | history
builtin.h patch | diff1 | diff2 | blob | history
git.c patch | diff1 | diff2 | blob | history
gitweb/gitweb.perl patch | diff1 | diff2 | blob | history
diff --cc Makefile
Simple merge
diff --cc builtin.h
index f71b9629b9c8671dd17296fabac7e1952b3fb9e9,2c5d900acc9e2c6497501c3088efa176b955cb9d..4ac32d7780f3ebaf0bd91b639ed4781a8ab9d0e4
--- 1/builtin.h
--- 2/builtin.h
+++ b/builtin.h
@@@ -11,9 -11,9 +11,10 @@@ extern int mailinfo(FILE *in, FILE *out
  extern int split_mbox(const char **mbox, const char *dir, int allow_bare, int nr_prec, int skip);
  extern void stripspace(FILE *in, FILE *out);
  extern int write_tree(unsigned char *sha1, int missing_ok, const char *prefix);
 +extern void prune_packed_objects(int);
  
  extern int cmd_add(int argc, const char **argv, const char *prefix);
+ extern int cmd_annotate(int argc, const char **argv, const char *prefix);
  extern int cmd_apply(int argc, const char **argv, const char *prefix);
  extern int cmd_archive(int argc, const char **argv, const char *prefix);
  extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
diff --cc git.c
Simple merge
diff --cc gitweb/gitweb.perl
index bc8d8eb238c41a682924c6121e494bd7a1b5153e,34b88ce8ebf563df0d0e0602fb6701b06849a2fe..9eb19bb82ed843c6de6040c28cbbbff8e1ea9595
--- 1/gitweb/gitweb.perl
--- 2/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@@ -41,12 -41,20 +41,22 @@@ our $home_link_str = "++GITWEB_HOME_LIN
  # replace this with something more descriptive for clearer bookmarks
  our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled";
  
+ # filename of html text to include at top of each page
+ our $site_header = "++GITWEB_SITE_HEADER++";
  # html text to include at home page
  our $home_text = "++GITWEB_HOMETEXT++";
+ # filename of html text to include at bottom of each page
+ our $site_footer = "++GITWEB_SITE_FOOTER++";
+ 
+ # URI of stylesheets
+ our @stylesheets = ("++GITWEB_CSS++");
+ our $stylesheet;
+ # default is not to define style sheet, but it can be overwritten later
+ undef $stylesheet;
  
 -# URI of GIT logo
 +# URI of default stylesheet
 +our $stylesheet = "++GITWEB_CSS++";
 +# URI of GIT logo (72x27 size)
  our $logo = "++GITWEB_LOGO++";
  # URI of GIT favicon, assumed to be image/png type
  our $favicon = "++GITWEB_FAVICON++";
@@@ -900,11 -864,10 +925,10 @@@ sub git_get_projects_list 
                        if (!defined $path) {
                                next;
                        }
-                       if (-e "$projectroot/$path/HEAD" && (!$export_ok ||
-                           -e "$projectroot/$path/$export_ok")) {
+                       if (check_export_ok("$projectroot/$path")) {
                                my $pr = {
                                        path => $path,
 -                                      owner => decode("utf8", $owner, Encode::FB_DEFAULT),
 +                                      owner => to_utf8($owner),
                                };
                                push @list, $pr
                        }
@@@ -1435,11 -1408,20 +1471,18 @@@ EO
        }
  
        print "</head>\n" .
-             "<body>\n" .
-             "<div class=\"page_header\">\n" .
+             "<body>\n";
+ 
+       if (-f $site_header) {
+               open (my $fd, $site_header);
+               print <$fd>;
+               close $fd;
+       }
+ 
+       print "<div class=\"page_header\">\n" .
 -            "<a href=\"" . esc_html($githelp_url) .
 -            "\" title=\"" . esc_html($githelp_label) .
 -            "\">" .
 -            "<img src=\"$logo\" width=\"72\" height=\"27\" alt=\"git\" style=\"float:right; border-width:0px;\"/>" .
 -            "</a>\n";
 +            $cgi->a({-href => esc_url($logo_url),
 +                     -title => $logo_label},
 +                    qq(<img src="$logo" width="72" height="27" alt="git" class="logo"/>));
        print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / ";
        if (defined $project) {
                print $cgi->a({-href => href(action=>"summary")}, esc_html($project));