Loading...
Helix SwarmHelix Swarm
Loading...

diff.jsp

  • //
  • guest/
  • david_markley/
  • p4jsp/
  • web/
  • diff.jsp #5
  • View
  • Commits
  • Open Download .zip Download (2 KB) 
  1. <?xml version="1.0"?>
  2. <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
  3. <jsp:directive.page import="java.util.*,com.perforce.api.*" contentType="text/html;charset=ISO-8859-1"/>
  4. <jsp:directive.include file="session.jsp"/>
  5. <jsp:text><HTML><HEAD>
  6. <jsp:directive.include file="head.jsp"/>
  7. </HEAD>
  8. <BODY bgcolor="#FFFFFF" marginheight="0" marginwidth="0" topmargin="0" leftmargin="0">
  9. <TABLE width="780" cellspacing="0" cellpadding="0" border="0">
  10. <jsp:directive.include file="navbar.jsp"/>
  11. <TR><TD><TABLE width="100%" cellspacing="0" cellpadding="0" border="0">
  12. <TR><TD width="21"><IMG src="images/s.gif" width="21" rowspan="10"/></TD><TD width="100%">
  13. <H1>File Diff:</H1>
  14. <jsp:scriptlet>
  15. String path = request.getParameter("path");
  16. if (null == path) {
  17.   response.sendRedirect(response.encodeRedirectURL("index.jsp"));
  18.   return;
  19. }
  20. String r1 = request.getParameter("r1");
  21. String r2 = request.getParameter("r2");
  22.  
  23. FileEntry fent = new FileEntry(env, path);
  24. fent.sync();
  25. if (null == r1) r1 = String.valueOf(fent.getHeadRev()-1);
  26. if (null == r2) r2 = String.valueOf(fent.getHeadRev());
  27.  
  28. out.print("File: "+Utils.formatDepotPath(fent.getDepotPath(), "&lt;A href=\"browse.jsp?path={0}\"&gt;{1}&lt;/A&gt;", "&lt;A href=\"file.jsp?path={0}\"&gt;{1}&lt;/A&gt;",null, true));
  29. out.print("&lt;BR/&gt;");
  30. out.print("Versions: #"+r1+" to #"+r2);
  31. out.print("&lt;HR/&gt;");
  32.  
  33. String cmd[] = { "p4", "diff2", "-du", path+"#"+r1, path+"#"+r2 };
  34. String l, c;
  35. out.println("&lt;PRE style=\"diff\"&gt;");
  36. try {
  37.   P4Process p = new P4Process(env);
  38.   p.setRawMode(true);
  39.   p.exec(cmd);
  40.   while (null != (l = p.readLine())) {
  41.     if (l.startsWith("text: ")) {
  42.       l = l.substring(6);
  43.     } else {
  44.       continue;
  45.     }
  46.     
  47.     switch (l.charAt(0)) {
  48.       case '@':
  49. 	c = "diffmacro";
  50. 	break;
  51.       case '+':
  52. 	c = "diffadd";
  53. 	if (1 &gt; l.length()) {
  54.           l = "";
  55. 	} else {
  56.           l = l.substring(1);
  57. 	}
  58. 	break;
  59.       case '-':
  60. 	c = "diffsub";
  61. 	if (2 &gt; l.length()) {
  62.           l = "&amp;nbsp;";
  63. 	} else {
  64.           l = l.substring(1);
  65. 	}
  66. 	break;
  67.       default:
  68. 	c = "diff";
  69. 	if (2 &gt; l.length()) {
  70.           l = "&amp;nbsp;";
  71. 	} else {
  72.           l = l.substring(1);
  73. 	}
  74. 	break;
  75.     }
  76.     l = Utils.HTMLEncode(l);
  77.     out.println("&lt;SPAN class=\""+c+"\"&gt;"+l+"&lt;/SPAN&gt;");
  78.   }
  79.   p.close();
  80. } catch (Exception ex) {
  81.   /* Ignored. */
  82. }
  83.  
  84. out.println("&lt;/PRE&gt;");
  85.  
  86. </jsp:scriptlet>
  87.  
  88. </TD></TR>
  89. </TABLE></TD></TR>
  90. </TABLE></BODY></HTML></jsp:text>
  91. </jsp:root>
# Change User Description Committed
#5 2206 David Markley Removed all use of the common tag library and any specific inclusion
of the crimson API. 		22 years ago
#4 2070 David Markley Updated to work with Tomcat 4.0.4 23 years ago
#3 1845 David Markley Fixed spacing issues on the diff and view pages. 23 years ago
#2 1842 David Markley Updated pages to include titles and added view and diff pages. 23 years ago
#1 1836 David Markley Added file information and improved item listings. 23 years ago