From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Koegler Subject: [PATCH 4/5] gitweb: Selecting diffs in JavaScript Date: Sun, 20 May 2007 22:23:31 +0200 Message-ID: <11796926122089-git-send-email-mkoegler@auto.tuwien.ac.at> References: <11796926121641-git-send-email-mkoegler@auto.tuwien.ac.at> <11796926121315-git-send-email-mkoegler@auto.tuwien.ac.at> <11796926121911-git-send-email-mkoegler@auto.tuwien.ac.at> Cc: git@vger.kernel.org, Martin Koegler To: Petr Baudis X-From: git-owner@vger.kernel.org Sun May 20 22:23:47 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1HprwQ-0003nX-Jo for gcvg-git@gmane.org; Sun, 20 May 2007 22:23:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756187AbXETUXk (ORCPT ); Sun, 20 May 2007 16:23:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756252AbXETUXk (ORCPT ); Sun, 20 May 2007 16:23:40 -0400 Received: from thor.auto.tuwien.ac.at ([128.130.60.15]:59506 "EHLO thor.auto.tuwien.ac.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755969AbXETUXh (ORCPT ); Sun, 20 May 2007 16:23:37 -0400 Received: from localhost (localhost [127.0.0.1]) by thor.auto.tuwien.ac.at (Postfix) with ESMTP id 5FC327AF1C80; Sun, 20 May 2007 22:23:34 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at auto.tuwien.ac.at Received: from thor.auto.tuwien.ac.at ([127.0.0.1]) by localhost (thor.auto.tuwien.ac.at [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id risWTJQkpWCT; Sun, 20 May 2007 22:23:33 +0200 (CEST) Received: by thor.auto.tuwien.ac.at (Postfix, from userid 3001) id 7728D7AF1C81; Sun, 20 May 2007 22:23:32 +0200 (CEST) X-Mailer: git-send-email 1.5.0.5 In-Reply-To: <11796926121911-git-send-email-mkoegler@auto.tuwien.ac.at> Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: The adds support for selecting arbitrary diffs, if the client browser supports JavaScript. Signed-off-by: Martin Koegler --- Makefile | 6 +- git-instaweb.sh | 7 ++ gitweb/gitweb.js | 298 ++++++++++++++++++++++++++++++++++++++++++++++++++++ gitweb/gitweb.perl | 6 + 4 files changed, 316 insertions(+), 1 deletions(-) create mode 100644 gitweb/gitweb.js diff --git a/Makefile b/Makefile index 521c003..2d04ef9 100644 --- a/Makefile +++ b/Makefile @@ -167,6 +167,7 @@ GITWEB_HOMETEXT = indextext.html GITWEB_CSS = gitweb.css GITWEB_LOGO = git-logo.png GITWEB_FAVICON = git-favicon.png +GITWEB_JS = gitweb.js GITWEB_SITE_HEADER = GITWEB_SITE_FOOTER = @@ -811,13 +812,14 @@ gitweb/gitweb.cgi: gitweb/gitweb.perl -e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \ -e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \ -e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \ + -e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \ -e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \ -e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \ $< >$@+ && \ chmod +x $@+ && \ mv $@+ $@ -git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css +git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css gitweb/gitweb.js $(QUIET_GEN)rm -f $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ @@ -826,6 +828,8 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css -e '/@@GITWEB_CGI@@/d' \ -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \ -e '/@@GITWEB_CSS@@/d' \ + -e '/@@GITWEB_JS@@/r gitweb/gitweb.js' \ + -e '/@@GITWEB_JS@@/d' \ $@.sh > $@+ && \ chmod +x $@+ && \ mv $@+ $@ diff --git a/git-instaweb.sh b/git-instaweb.sh index cbc7418..8cb62f1 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -233,8 +233,15 @@ gitweb_css () { EOFGITWEB } +gitweb_js () { + cat > "$1" <<\EOFGITWEB +@@GITWEB_JS@@ +EOFGITWEB +} + gitweb_cgi $GIT_DIR/gitweb/gitweb.cgi gitweb_css $GIT_DIR/gitweb/gitweb.css +gitweb_js $GIT_DIR/gitweb/gitweb.js case "$httpd" in *lighttpd*) diff --git a/gitweb/gitweb.js b/gitweb/gitweb.js new file mode 100644 index 0000000..cacab5a --- /dev/null +++ b/gitweb/gitweb.js @@ -0,0 +1,298 @@ +/* Javascript functions for gitweb + + (C) 2007 Martin Koegler + + This file is licensed under the GPL v2, or (at your option) any later version. +*/ + +function getCookie (name) +{ + var name = name + "="; + var c = document.cookie; + var p = c.indexOf (name); + if (p == -1) + return null; + c = c.substr (p + name.length, c.length); + p = c.indexOf (";"); + if (p == -1) + return c; + else + return c.substr (0, p); +} + +function insertAfter (elem, node) +{ + if (node.nextSibling) + node.parentNode.insertBefore (elem, node.nextSibling); + else + node.parentNode.appendChild (elem); +} + +function createLink (href, linktext) +{ + var l = document.createElement ("a"); + l.appendChild (document.createTextNode (linktext)); + l.href = href; + return l; +} + +function createLinkGroup (href1, basetxt, href2, difftxt) +{ + var l = document.createElement ("span"); + l.appendChild (document.createTextNode (" (")); + l.appendChild (createLink (href1, basetxt)); + l.appendChild (document.createTextNode (" | ")); + l.appendChild (createLink (href2, difftxt)); + l.appendChild (document.createTextNode (") ")); + return l; +} + +function GitRef () +{ + this.t = null; + this.h = null; + this.hb = null; + this.f = null; + this.p = null; + this.ToRef = ToRef; +} + +function ToRef () +{ + var parts = new Array (); + if (this.f) + parts.push ("f=" + this.f); + if (this.h) + parts.push ("h=" + this.h); + if (this.hb) + parts.push ("hb=" + this.hb); + if (this.t) + parts.push ("t=" + this.t); + if (this.p) + parts.push ("p=" + this.p); + return parts.join ("@"); +} + +function splitGitRef (ref) +{ + var parts = ref.split ("@"); + var res = new GitRef (); + var i; + for (i = 0; i < parts.length; i++) + { + var p = parts[i].split ("="); + res[p[0]] = p[1]; + } + return res; +} + +function GitURL (base) +{ + this.base = base; + this.p = null; + this.a = null; + this.f = null; + this.fp = null; + this.h = null; + this.hp = null; + this.hb = null; + this.hpb = null; + this.pg = null; + this.o = null; + this.s = null; + this.st = null; + this.ToURL = ToURL; + this.ToRef = UrlToRef; + this.ToDUrl = ToDUrl; +} + +function ToURL () +{ + var parts = new Array (); + if (this.p) + parts.push ("p=" + this.p); + if (this.a) + parts.push ("a=" + this.a); + if (this.f) + parts.push ("f=" + this.f); + if (this.fp) + parts.push ("fp=" + this.fp); + if (this.h) + parts.push ("h=" + this.h); + if (this.hp) + parts.push ("hp=" + this.hp); + if (this.hb) + parts.push ("hb=" + this.hb); + if (this.hpb) + parts.push ("hpb=" + this.hpb); + if (this.o) + parts.push ("o=" + this.o); + if (this.s) + parts.push ("s=" + this.s); + if (this.st) + parts.push ("st=" + this.st); + return this.base + "?" + parts.join (";"); +} + +function UrlToRef (type) +{ + var res = new GitRef; + res.f = this.f; + res.h = this.h; + res.hb = this.hb; + res.t = type; + res.p = this.p; + return res.ToRef (); +} + +function ToDUrl (type) +{ + var res = new GitURL (this.base); + res.f = this.f; + res.h = this.h; + res.hb = this.hb; + res.p = this.p; + res.a = type; + return res.ToURL (); +} + +function splitGitURL (url) +{ + var Urls = url.split ("?"); + var res = new GitURL (Urls[0]); + if (Urls.length > 1) + { + var parts = Urls[1].split (";"); + var i; + for (i = 0; i < parts.length; i++) + { + var p = parts[i].split ("="); + res[p[0]] = p[1]; + } + } + return res; +} + +function base (ref) +{ + document.cookie = "basename=" + ref; +} + +function diff (url) +{ + var c = getCookie ("basename"); + if (!c) + { + alert ("no diff base selected"); + return; + } + c = splitGitRef (c); + url = splitGitURL (url); + + if (c.p != url.p) + { + alert ("base object in an other repository"); + return; + } + + if (c.t == 'commit' && url.a == 'commit') + { + url.a = 'commitdiff'; + if (!c.h || !url.h) + { + alert ("commit diff not possible"); + return; + } + url.hb = null; + url.f = null; + url.hp = c.h; + document.location.href = url.ToURL (); + return; + } + if (c.t == 'blob' && url.a == 'blob') + { + url.a = 'blobdiff'; + url.hp = c.h; + url.hpb = c.hb; + url.fp = c.f; + document.location.href = url.ToURL (); + return; + } + if (c.t == 'tree' && url.a == 'tree') + { + url.a = 'treediff'; + url.hpb = c.hb; + url.hp = c.h; + url.fp = c.f; + document.location.href = url.ToURL (); + return; + } + if (c.t == 'commit' && url.a == 'tree') + { + url.a = 'treediff'; + url.hpb = c.h; + url.hp = null; + url.fp = null; + document.location.href = url.ToURL (); + return; + } + if (c.t == 'tree' && url.a == 'commit') + { + url.a = 'treediff'; + url.hpb = c.hb; + url.hp = c.h; + url.fp = c.f; + url.hb = url.h; + url.h = null; + document.location.href = url.ToURL (); + return; + } + alert ("diff not possible"); +} + +function GitAddLinks () +{ + var links = document.getElementsByTagName ("a"); + var i; + + for (i = 0; i < links.length; i++) + { + var link = links[i]; + var url = splitGitURL (link.href); + if (link.innerHTML == 'commit' || link.innerHTML == 'tag') + { + if (!url.h) + continue; + var l = + createLinkGroup ("javascript:base('" + url.ToRef ('commit') + + "')", "base", + "javascript:diff('" + url.ToDUrl ('commit') + + "')", "diff"); + insertAfter (l, link); + } + if (link.innerHTML == 'blob') + { + if (!url.h && !(url.hb && url.f)) + continue; + var l = + createLinkGroup ("javascript:base('" + url.ToRef ('blob') + "')", + "base", + "javascript:diff('" + url.ToDUrl ('blob') + "')", + "diff"); + insertAfter (l, link); + } + if (link.innerHTML == 'tree') + { + if (!url.h && !(url.hb && url.f)) + continue; + var l = + createLinkGroup ("javascript:base('" + url.ToRef ('tree') + "')", + "base", + "javascript:diff('" + url.ToDUrl ('tree') + "')", + "diff"); + insertAfter (l, link); + } + } +} + +window.onload = GitAddLinks; diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index d161c8b..f59a4b5 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -61,6 +61,8 @@ our $stylesheet = undef; our $logo = "++GITWEB_LOGO++"; # URI of GIT favicon, assumed to be image/png type our $favicon = "++GITWEB_FAVICON++"; +# URI of gitweb.js +our $gitwebjs = "++GITWEB_JS++"; # URI and label (title) of GIT logo link #our $logo_url = "http://www.kernel.org/pub/software/scm/git/docs/"; @@ -1909,6 +1911,10 @@ EOF print qq(\n); } + if (defined $gitwebjs) { + print qq(\n); + } + print "\n" . "\n"; -- 1.5.2.rc3.802.g4b4b7