git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin Koegler <mkoegler@auto.tuwien.ac.at>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org, Martin Koegler <mkoegler@auto.tuwien.ac.at>
Subject: [PATCH 5/7] gitweb: Prototyp for selecting diffs in JavaScript
Date: Sun, 15 Apr 2007 22:46:08 +0200	[thread overview]
Message-ID: <1176669971921-git-send-email-mkoegler@auto.tuwien.ac.at> (raw)
Message-ID: <481946c2e3cff09ed4a623b1b20b9889666aedb0.1176659095.git.mkoegler@auto.tuwien.ac.at> (raw)
In-Reply-To: <1176669971694-git-send-email-mkoegler@auto.tuwien.ac.at>
In-Reply-To: <437446e84f3aea71f74fea7ea66db4c1c326fb6b.1176659094.git.mkoegler@auto.tuwien.ac.at>

---
This patch is only to test the other patches. I'm working on reimplementing it in perl.

 gitweb/gitweb.js   |  273 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 gitweb/gitweb.perl |    1 +
 2 files changed, 274 insertions(+), 0 deletions(-)
 create mode 100644 gitweb/gitweb.js

diff --git a/gitweb/gitweb.js b/gitweb/gitweb.js
new file mode 100644
index 0000000..2e1a94d
--- /dev/null
+++ b/gitweb/gitweb.js
@@ -0,0 +1,273 @@
+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.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);
+  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;
+    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 GitAddLinks()
+{
+  var links=document.getElementsByTagName("a");
+  var i;
+  for(i=0;i<links.length;i++)
+    {
+      var link=links[i];
+      if(link.innerHTML=='commit'||link.innerHTML=='tag')
+	{
+	  var url=splitGitURL(link.href);
+	  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')
+	{
+	  var url=splitGitURL(link.href);
+	  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')
+	{
+	  var url=splitGitURL(link.href);
+	  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);
+	}
+    }
+}
+
+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.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");
+}
+
+GitAddLinks();
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index c2dc82d..769e755 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1860,6 +1860,7 @@ sub git_footer_html {
 		close $fd;
 	}
 
+	print '<script type="text/javascript" src="gitweb.js"></script>';
 	print "</body>\n" .
 	      "</html>";
 }
-- 
1.5.1.1.85.gf1888

  parent reply	other threads:[~2007-04-15 20:46 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <437446e84f3aea71f74fea7ea66db4c1c326fb6b.1176659094.git.mkoegler@auto.tuwien.ac.at>
2007-04-15 20:46 ` [PATCH 1/7] gitweb: show "no difference" message for empty diff Martin Koegler
2007-04-18 13:52   ` Jakub Narebski
     [not found] ` <a209e0308fc80ef0623baef8dca49e61b7bafaab.1176659094.git.mkoegler@auto.tuwien.ac.at>
2007-04-15 20:46   ` [PATCH 2/7] gitweb: Support comparing blobs with different names Martin Koegler
2007-04-20 10:34     ` Jakub Narebski
2007-04-20 11:24       ` Junio C Hamano
2007-04-20 20:49         ` Jakub Narebski
2007-04-21 12:23           ` [PATCH 0/4] git-diff: use mode for tree:name syntax (was: Re: [PATCH 2/7] gitweb: Support comparing blobs with different names) Martin Koegler
2007-04-16 20:18   ` [PATCH 2/7] gitweb: Support comparing blobs with different names Martin Koegler
2007-04-29 21:35     ` Jakub Narebski
2007-04-30  5:27       ` Martin Koegler
     [not found] ` <201e30b3f69b40aec4f52ca16a22206f7db1c17d.1176659094.git.mkoegler@auto.tuwien.ac.at>
2007-04-15 20:46   ` [PATCH 3/7] gitweb: support filename prefix in git_patchset_body/git_difftree_body Martin Koegler
2007-04-27 10:55     ` Jakub Narebski
2007-04-28  8:22       ` Martin Koegler
     [not found] ` <083c27614411a8fd7edafef8f5cba91625c88453.1176659095.git.mkoegler@auto.tuwien.ac.at>
2007-04-15 20:46   ` [PATCH 6/7] gitweb: pass root directory as empty file parameter Martin Koegler
     [not found] ` <aba7141dc09643b4d6233f1bfb15677163991a27.1176659095.git.mkoegler@auto.tuwien.ac.at>
2007-04-15 20:46   ` [PATCH 7/7] gitweb: Adapt gitweb.js to new git_treeview calling convention Martin Koegler
     [not found] ` <85de402216e82cc0f220df9d27370a33538a232a.1176659094.git.mkoegler@auto.tuwien.ac.at>
2007-04-15 20:46   ` [PATCH 4/7] gitweb: Add treediff view Martin Koegler
2007-04-16 20:20   ` Martin Koegler
     [not found] ` <481946c2e3cff09ed4a623b1b20b9889666aedb0.1176659095.git.mkoegler@auto.tuwien.ac.at>
2007-04-15 20:46   ` Martin Koegler [this message]
2007-05-18  8:49   ` [PATCH 5/7] gitweb: Prototyp for selecting diffs in JavaScript Petr Baudis
2007-05-19  7:57     ` Martin Koegler
2007-05-19  8:27       ` Petr Baudis

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=1176669971921-git-send-email-mkoegler@auto.tuwien.ac.at \
    --to=mkoegler@auto.tuwien.ac.at \
    --cc=git@vger.kernel.org \
    --cc=jnareb@gmail.com \
    /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).