Mercurial > hg

changeset 6692:683428d1e639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make graph view work with paper style
author Matt Mackall <mpm@selenic.com>
date Wed, 18 Jun 2008 00:28:40 -0500
parents 0dba955c2636
children b3602c98c686
files mercurial/hbisect.py templates/paper/map templates/static/style-paper.css
diffstat 3 files changed, 45 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hbisect.py	Wed Jun 18 07:06:41 2008 +0200
+++ b/mercurial/hbisect.py	Wed Jun 18 00:28:40 2008 -0500
@@ -90,9 +90,9 @@
                 break
 
         if y < perfect: # all downhill from here?
-            for c in children.get(rev, []):
-                poison[c] = True # poison children
-            continue
+           for c in children.get(rev, []):
+               poison[c] = True # poison children
+           continue
 
         for c in children.get(rev, []):
             if ancestors[c]:
--- a/templates/paper/map	Wed Jun 18 07:06:41 2008 +0200
+++ b/templates/paper/map	Wed Jun 18 00:28:40 2008 -0500
@@ -8,6 +8,7 @@
 changelog = ../coal/shortlog.tmpl
 shortlog = ../coal/shortlog.tmpl
 shortlogentry = ../coal/shortlogentry.tmpl
+graph = ../coal/graph.tmpl
 
 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
--- a/templates/static/style-paper.css	Wed Jun 18 07:06:41 2008 +0200
+++ b/templates/static/style-paper.css	Wed Jun 18 00:28:40 2008 -0500
@@ -150,3 +150,44 @@
   margin: 1em 0 1em 0;
   padding: .3em;
 }
+
+div#wrapper {
+	position: relative;
+	border-top: 1px solid black;
+	border-bottom: 1px solid black;
+	margin: 0;
+	padding: 0;
+}
+
+canvas {
+	position: absolute;
+	z-index: 5;
+	top: -0.7em;
+	margin: 0;
+}
+
+ul#graphnodes {
+	position: absolute;
+	z-index: 10;
+	top: -1.0em;
+	list-style: none inside none;
+	padding: 0;
+}
+
+ul#nodebgs {
+	list-style: none inside none;
+	padding: 0;
+	margin: 0;
+	top: -0.7em;
+}
+
+ul#graphnodes li, ul#nodebgs li {
+	height: 39px;
+}
+
+ul#graphnodes li .info {
+	display: block;
+	font-size: 70%;
+	position: relative;
+	top: -3px;
+}