Mercurial > hg

changeset 7565:5f162f61e479

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: fix problems with empty repositories
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sun, 04 Jan 2009 19:10:42 +0100
parents f1af59451c0c
children 5f7e3f17aece de16a665754c
files mercurial/graphmod.py mercurial/hgweb/webcommands.py tests/test-hgweb-empty tests/test-hgweb-empty.out
diffstat 4 files changed, 364 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/graphmod.py	Sat Jan 03 20:16:10 2009 +0100
+++ b/mercurial/graphmod.py	Sun Jan 04 19:10:42 2009 +0100
@@ -26,6 +26,9 @@
       - The changeset date/time
     """
 
+    if start_rev == nullrev and not stop_rev:
+        return
+
     assert start_rev >= stop_rev
     assert stop_rev >= 0
     curr_rev = start_rev
--- a/mercurial/hgweb/webcommands.py	Sat Jan 03 20:16:10 2009 +0100
+++ b/mercurial/hgweb/webcommands.py	Sun Jan 04 19:10:42 2009 +0100
@@ -292,7 +292,7 @@
                     break
             h[None] = None # denotes files present
 
-    if not files and not dirs:
+    if mf and not files and not dirs:
         raise ErrorResponse(HTTP_NOT_FOUND, 'path not found: ' + path)
 
     def filelist(**map):
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-hgweb-empty	Sun Jan 04 19:10:42 2009 +0100
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Some tests for hgweb in an empty repository
+
+hg init test
+cd test
+hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
+cat hg.pid >> $DAEMON_PIDS
+
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/shortlog')
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/log')
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/graph')
+("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file')
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-hgweb-empty.out	Sun Jan 04 19:10:42 2009 +0100
@@ -0,0 +1,348 @@
+200 Script output follows
+
+<!-- quirksmode -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="icon" href="/static/hgicon.png" type="image/png">
+<meta name="robots" content="index, nofollow" />
+<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
+
+<title>test: log</title>
+<link rel="alternate" type="application/atom+xml"
+   href="/atom-log" title="Atom feed for test">
+<link rel="alternate" type="application/rss+xml"
+   href="/rss-log" title="RSS feed for test">
+</head>
+<body>
+
+<div class="container">
+<div class="menu">
+<div class="logo">
+<a href="http://www.selenic.com/mercurial/">
+<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
+</div>
+<ul>
+<li class="active">log</li>
+<li><a href="/graph/000000000000">graph</a></li>
+<li><a href="/tags">tags</a></li>
+</ul>
+<ul>
+<li><a href="/rev/000000000000">changeset</a></li>
+<li><a href="/file/000000000000">browse</a></li>
+</ul>
+<ul>
+
+</ul>
+</div>
+
+<div class="main">
+<h2><a href="/">test</a></h2>
+<h3>log</h3>
+
+<form class="search" action="/log">
+
+<p><input name="rev" id="search1" type="text" size="30"></p>
+<span>find changesets by author, revision,
+files, or words in the commit message</span>
+</form>
+
+<div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div>
+
+<table class="bigtable">
+ <tr>
+  <th class="age">age</th>
+  <th class="author">author</th>
+  <th class="description">description</th>
+ </tr>
+
+</table>
+
+<div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div>
+</div>
+</div>
+
+
+
+</body>
+</html>
+
+200 Script output follows
+
+<!-- quirksmode -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="icon" href="/static/hgicon.png" type="image/png">
+<meta name="robots" content="index, nofollow" />
+<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
+
+<title>test: log</title>
+<link rel="alternate" type="application/atom+xml"
+   href="/atom-log" title="Atom feed for test">
+<link rel="alternate" type="application/rss+xml"
+   href="/rss-log" title="RSS feed for test">
+</head>
+<body>
+
+<div class="container">
+<div class="menu">
+<div class="logo">
+<a href="http://www.selenic.com/mercurial/">
+<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
+</div>
+<ul>
+<li class="active">log</li>
+<li><a href="/graph/000000000000">graph</a></li>
+<li><a href="/tags">tags</a></li>
+</ul>
+<ul>
+<li><a href="/rev/000000000000">changeset</a></li>
+<li><a href="/file/000000000000">browse</a></li>
+</ul>
+<ul>
+
+</ul>
+</div>
+
+<div class="main">
+<h2><a href="/">test</a></h2>
+<h3>log</h3>
+
+<form class="search" action="/log">
+
+<p><input name="rev" id="search1" type="text" size="30"></p>
+<span>find changesets by author, revision,
+files, or words in the commit message</span>
+</form>
+
+<div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div>
+
+<table class="bigtable">
+ <tr>
+  <th class="age">age</th>
+  <th class="author">author</th>
+  <th class="description">description</th>
+ </tr>
+
+</table>
+
+<div class="navigate">rev -1: <a href="/shortlog/000000000000">(0)</a> <a href="/shortlog/tip">tip</a> </div>
+</div>
+</div>
+
+
+
+</body>
+</html>
+
+200 Script output follows
+
+<!-- quirksmode -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="icon" href="/static/hgicon.png" type="image/png">
+<meta name="robots" content="index, nofollow" />
+<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
+
+<title>test: revision graph</title>
+<link rel="alternate" type="application/atom+xml"
+   href="/atom-log" title="Atom feed for test: log">
+<link rel="alternate" type="application/rss+xml"
+   href="/rss-log" title="RSS feed for test: log">
+<!--[if IE]><script type="text/javascript" src="/static/excanvas.js"></script><![endif]-->
+</head>
+<body>
+
+<div class="container">
+<div class="menu">
+<div class="logo">
+<a href="http://www.selenic.com/mercurial/">
+<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
+</div>
+<ul>
+<li><a href="/shortlog/000000000000">log</a></li>
+<li class="active">graph</li>
+<li><a href="/tags">tags</a></li>
+</ul>
+<ul>
+<li><a href="/rev/000000000000">changeset</a></li>
+<li><a href="/file/000000000000">browse</a></li>
+</ul>
+</div>
+
+<div class="main">
+<h2><a href="/">test</a></h2>
+<h3>graph</h3>
+
+<form class="search" action="/log">
+
+<p><input name="rev" id="search1" type="text" size="30"></p>
+<span>find changesets by author, revision,
+files, or words in the commit message</span>
+</form>
+
+<div class="navigate">
+<a href="/graph/-1?revcount=12">less</a>
+<a href="/graph/-1?revcount=50">more</a>
+| rev -1: <a href="/graph/000000000000">(0)</a> <a href="/graph/tip">tip</a> 
+</div>
+
+<noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>
+
+<div id="wrapper">
+<ul id="nodebgs"></ul>
+<canvas id="graph" width="224" height="12"></canvas>
+<ul id="graphnodes"></ul>
+</div>
+
+<script type="text/javascript" src="/static/graph.js"></script>
+<script type="text/javascript">
+<!-- hide script content
+
+var data = [];
+var graph = new Graph();
+graph.scale(39);
+
+graph.edge = function(x0, y0, x1, y1, color) {
+	
+	this.setColor(color, 0.0, 0.65);
+	this.ctx.beginPath();
+	this.ctx.moveTo(x0, y0);
+	this.ctx.lineTo(x1, y1);
+	this.ctx.stroke();
+	
+}
+
+var revlink = '<li style="_STYLE"><span class="desc">';
+revlink += '<a href="/rev/_NODEID" title="_NODEID">_DESC</a>';
+revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
+
+graph.vertex = function(x, y, color, parity, cur) {
+	
+	this.ctx.beginPath();
+	color = this.setColor(color, 0.25, 0.75);
+	this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
+	this.ctx.fill();
+	
+	var bg = '<li class="bg parity' + parity + '"></li>';
+	var left = (this.columns + 1) * this.bg_height;
+	var nstyle = 'padding-left: ' + left + 'px;';
+	var item = revlink.replace(/_STYLE/, nstyle);
+	item = item.replace(/_PARITY/, 'parity' + parity);
+	item = item.replace(/_NODEID/, cur[0]);
+	item = item.replace(/_NODEID/, cur[0]);
+	item = item.replace(/_DESC/, cur[3]);
+	item = item.replace(/_USER/, cur[4]);
+	item = item.replace(/_DATE/, cur[5]);
+
+	var tagspan = '';
+	if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
+		tagspan = '<span class="logtags">';
+		if (cur[6][1]) {
+			tagspan += '<span class="branchhead" title="' + cur[6][0] + '">';
+			tagspan += cur[6][0] + '</span> ';
+		} else if (!cur[6][1] && cur[6][0] != 'default') {
+			tagspan += '<span class="branchname" title="' + cur[6][0] + '">';
+			tagspan += cur[6][0] + '</span> ';
+		}
+		if (cur[7].length) {
+			for (var t in cur[7]) {
+				var tag = cur[7][t];
+				tagspan += '<span class="tag">' + tag + '</span> ';
+			}
+		}
+		tagspan += '</span>';
+	}
+	
+	item = item.replace(/_TAGS/, tagspan);
+	return [bg, item];
+	
+}
+
+graph.render(data);
+
+// stop hiding script -->
+</script>
+
+<div class="navigate">
+<a href="/graph/-1?revcount=12">less</a>
+<a href="/graph/-1?revcount=50">more</a>
+| rev -1: <a href="/graph/000000000000">(0)</a> <a href="/graph/tip">tip</a> 
+</div>
+
+</div>
+</div>
+
+
+
+</body>
+</html>
+
+200 Script output follows
+
+<!-- quirksmode -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<link rel="icon" href="/static/hgicon.png" type="image/png">
+<meta name="robots" content="index, nofollow" />
+<link rel="stylesheet" href="/static/style-paper.css" type="text/css" />
+
+<title>test: 000000000000 /</title>
+</head>
+<body>
+
+<div class="container">
+<div class="menu">
+<div class="logo">
+<a href="http://www.selenic.com/mercurial/">
+<img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
+</div>
+<ul>
+<li><a href="/shortlog/000000000000">log</a></li>
+<li><a href="/graph/000000000000">graph</a></li>
+<li><a href="/tags">tags</a></li>
+</ul>
+<ul>
+<li><a href="/rev/000000000000">changeset</a></li>
+<li class="active">browse</li>
+</ul>
+<ul>
+
+</ul>
+</div>
+
+<div class="main">
+<h2><a href="/">test</a></h2>
+<h3>directory / @ -1:000000000000 <span class="tag">tip</span> </h3>
+
+<form class="search" action="/log">
+
+<p><input name="rev" id="search1" type="text" size="30"></p>
+<span>find changesets by author, revision,
+files, or words in the commit message</span>
+</form>
+
+<table class="bigtable">
+<tr>
+  <th class="name">name</th>
+  <th class="size">size</th>
+  <th class="permissions">permissions</th>
+</tr>
+<tr class="fileline parity0">
+  <td class="name"><a href="/file/000000000000/">[up]</a></td>
+  <td class="size"></td>
+  <td class="permissions">drwxr-xr-x</td>
+</tr>
+
+
+</table>
+</div>
+</div>
+
+
+</body>
+</html>
+