Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /insurrection/src/

Project highlights: A modern, light-weight, self-contained, web-based toolset for Subversion repository browsing and administration.  A live system can be seen in action here.

insurrection
Discussion topic

Back to topic list

CVS update: /insurrection/src/

Author mksoft
Full name Michae Sinz
Date 2006-03-28 20:39:24 PST
Message User: mksoft
Date: 2006/03/28 20:39:24

Modified:
   insurrection/src/.htaccess
   insurrection/src/ins​urrection.xsl
   insurrection/src/svnindex.js

Log:
 Merged up to http://svn.code-host​.net/svn/Insurrectio​n/?Insurrection=log​&r=324
 
 Note that this includes a bug fix to the historical browse mode operation.

File Changes:

Directory: /insurrection/src/
=============================

File [changed]: .htaccess
Url: http://insurrection.​tigris.org/source/br​owse/insurrection/sr​c/.htaccess?r1=1.26​&r2=1.27
Delta lines: +17 -1
--------------------
--- .htaccess 2 Mar 2006 22:23:55 -0000 1.26
+++ .htaccess 29 Mar 2006 04:39:22 -0000 1.27
@@ -1,5 +1,5 @@
 ##
-## $Id: .htaccess,v 1.26 2006/03/02 22:23:55 mksoft Exp $
+## $Id: .htaccess,v 1.27 2006/03/29 04:39:22 mksoft Exp $
 ## Copyright 2004,2005 - Michael Sinz
 ##
 
@@ -128,6 +128,22 @@
 RewriteCond %{REQUEST_METHOD} "^(GET|POST)$"
 RewriteCond %{QUERY_STRING} Insurrection=(admin|​atom|bandwidth|blame​|diff|dump|get|log|l​s|rss|savelog)
 RewriteRule ^svn(/.*)$ "http://%{HTTP_HOST}/​%1.cgi?%{QUERY_STRIN​G}&HTTPS=%{HTTPS​}&Path=$1" [P,L]
+
+## To support being able to get a revision with just the
+## revision number, we support "ls" if it is a directory
+## (ends with a "/") This removes the need to have the
+## ?Insurrection=ls&r=XXX and just makes it ?rXXX
+RewriteCond %{REQUEST_METHOD} "^(GET|POST)$"
+RewriteCond %{QUERY_STRING} "^r([0-9]+)$"
+RewriteRule ^svn(/.*/)$ "http://%{HTTP_HOST}/​ls.cgi?Insurrection=​ls&r=%1&HTTP​S=%{HTTPS}&Path=​$1" [P,L]
+
+## To support being able to get a revision with just the
+## revision number, we support "get" if it is not a directory
+## (ends without a "/") This removes the need to have the
+## ?Insurrection=ls&r=XXX and just makes it ?rXXX
+RewriteCond %{REQUEST_METHOD} "^(GET|POST)$"
+RewriteCond %{QUERY_STRING} "^r([0-9]+)$"
+RewriteRule ^svn(/.*[^/])$ "http://%{HTTP_HOST}/​get.cgi?Insurrection​=get&r=%1&HT​TPS=%{HTTPS}&Pat​h=$1" [P,L]
 
 ## The following rule is to catch the directory XML listing
 ## request and not let mod_dav_svn answer but rather our own

File [changed]: insurrection.xsl
Url: http://insurrection.​tigris.org/source/br​owse/insurrection/sr​c/insurrection.xsl?r​1=1.38&r2=1.39
Delta lines: +19 -19
---------------------
--- insurrection.xsl 7 Feb 2006 06:01:54 -0000 1.38
+++ insurrection.xsl 29 Mar 2006 04:39:22 -0000 1.39
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- $Id: insurrection.xsl,v 1.38 2006/02/07 06:01:54 mksoft Exp $ -->
+<!-- $Id: insurrection.xsl,v 1.39 2006/03/29 04:39:22 mksoft Exp $ -->
 <!-- Copyright 2004,2005 - Michael Sinz -->
 <!-- This is my magic Insurrection XSLT transform to HTML -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/19​99/XSL/Transform" xmlns:atom="http://www.w3.org/2005/Atom" version="1.0">
@@ -128,7 +128,7 @@
   </xsl:template>
 
   <xsl:template name="footer">
- <div class="footer" title="$Id: insurrection.xsl,v 1.38 2006/02/07 06:01:54 mksoft Exp $">
+ <div class="footer" title="$Id: insurrection.xsl,v 1.39 2006/03/29 04:39:22 mksoft Exp $">
       <a title="Valid XML 1.0!" href="http://validator.w3.​org/check?uri=refere​r">
         <xsl:element name="img">
           <xsl:attribute name="src">
@@ -142,7 +142,7 @@
   </xsl:template>
 
   <xsl:template name="footer-noXML">
- <div class="footer" title="$Id: insurrection.xsl,v 1.38 2006/02/07 06:01:54 mksoft Exp $">
+ <div class="footer" title="$Id: insurrection.xsl,v 1.39 2006/03/29 04:39:22 mksoft Exp $">
       <xsl:call-template name="footer-common"/>
     </div>
   </xsl:template>
@@ -228,8 +228,6 @@
           <xsl:attribute name="alt"></x​sl:attribute>
         </xsl:element>
 
- <!-- If there is a local banner defined, have the JS load it -->
- <xsl:if test="index/file[@href = '.svn_index']">
           <xsl:element name="script">
             <xsl:attribute name="type">text/​javascript</xsl:a​ttribute>
             <xsl:attribute name="language">J​avaScript</xsl:at​tribute>
@@ -238,9 +236,11 @@
               <xsl:value-of select="index/@rev"/>
               <xsl:text>;​</xsl:text>
             </xsl:if>
+ <!-- If there is a local banner defined, have the JS load it -->
+ <xsl:if test="index/file[@href = '.svn_index']">
             <xsl:text>load​Banner('.svn_index')​;</xsl:text>
- </xsl:element>
         </xsl:if>
+ </xsl:element>
 
       </body>
     </html>
@@ -275,7 +275,7 @@
               <xsl:with-param name="path" select="$path"/>
             </xsl:call-template>
             <xsl:if test="string-length($rev) != 0">
- <xsl:text>?Ins​urrection=ls&amp​;r=</xsl:text>​
+ <xsl:text>?r​</xsl:text>
               <xsl:value-of select="$rev"/>
             </xsl:if>
           </xsl:attribute>
@@ -460,7 +460,7 @@
           <xsl:attribute name="href">
             <xsl:value-of select="@href"/>
             <xsl:if test="string-length(../@rev) != 0">
- <xsl:text>?Ins​urrection=ls&amp​;r=</xsl:text>​
+ <xsl:text>?r​</xsl:text>
               <xsl:value-of select="../@rev"/>
             </xsl:if>
           </xsl:attribute>
@@ -574,7 +574,7 @@
           <xsl:attribute name="href">
             <xsl:value-of select="@href"/>
             <xsl:if test="string-length(../@rev) != 0">
- <xsl:text>?Ins​urrection=get&am​p;r=</xsl:text​>
+ <xsl:text>?r​</xsl:text>
               <xsl:value-of select="../@rev"/>
             </xsl:if>
           </xsl:attribute>
@@ -753,7 +753,7 @@
           <xsl:attribute name="class">brow​sepast</xsl:attri​bute>
           <xsl:attribute name="href">
             <xsl:value-of select="../@rpath"/>
- <xsl:text>/?In​surrection=ls&am​p;r=</xsl:text​>
+ <xsl:text>/?r​</xsl:text>
             <xsl:value-of select="@revision"/>
           </xsl:attribute>
           <xsl:attribute name="title">

File [changed]: svnindex.js
Url: http://insurrection.​tigris.org/source/br​owse/insurrection/sr​c/svnindex.js?r1=1.2​5&r2=1.26
Delta lines: +3 -3
-------------------
--- svnindex.js 5 Feb 2006 14:15:56 -0000 1.25
+++ svnindex.js 29 Mar 2006 04:39:22 -0000 1.26
@@ -1,5 +1,5 @@
 /*
- * $Id: svnindex.js,v 1.25 2006/02/05 14:15:56 mksoft Exp $
+ * $Id: svnindex.js,v 1.26 2006/03/29 04:39:22 mksoft Exp $
  * Copyright 2004,2005 - Michael Sinz
  *
  * Some JavaScript support routines for the svn index pages
@@ -87,7 +87,7 @@
 {
     if (document.InsurrectionRev)
     {
- uri = uri + '?Insurrection=get&r=' + document.InsurrectionRev;
+ uri = uri + '?r' + document.InsurrectionRev;
     }
 
     return(uri);
@@ -101,7 +101,7 @@
 {
     if (document.InsurrectionRev)
     {
- uri = uri + '?Insurrection=ls&r=' + document.InsurrectionRev;
+ uri = uri + '?r' + document.InsurrectionRev;
     }
 
     return(uri);

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /insurrection/src/ mksoft Michae Sinz 2006-03-28 20:39:24 PST
Messages per page: