# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1335569738 -7200
# Node ID 80c4c01d4c7bb0fc3d94877dc98d0689055e9fe6
# Parent  d50e96b62aa416c156ddc569a18ac3b64455bf6c
Removed the superfluous bg_height value from each row in the graph data.
Added test suite changes.

diff -r d50e96b62aa4 -r 80c4c01d4c7b patches/patch-hgweb-graph-data.diff
--- a/patches/patch-hgweb-graph-data.diff	Sat Apr 28 01:20:56 2012 +0200
+++ b/patches/patch-hgweb-graph-data.diff	Sat Apr 28 01:35:38 2012 +0200
@@ -1,6 +1,6 @@
 diff -r 55982f62651f mercurial/hgweb/webcommands.py
 --- a/mercurial/hgweb/webcommands.py	Wed Apr 18 01:20:16 2012 +0300
-+++ b/mercurial/hgweb/webcommands.py	Sat Apr 28 01:19:59 2012 +0200
++++ b/mercurial/hgweb/webcommands.py	Sat Apr 28 01:32:46 2012 +0200
 @@ -785,6 +785,8 @@
      tree = list(graphmod.colored(dag, web.repo))
      canvasheight = (len(tree) + 1) * bg_height - 27
@@ -10,7 +10,7 @@
      for (id, type, ctx, vtx, edges) in tree:
          if type != graphmod.CHANGESET:
              continue
-@@ -795,13 +797,38 @@
+@@ -795,13 +797,37 @@
          user = cgi.escape(templatefilters.person(ctx.user()))
          branch = ctx.branch()
          branch = branch, web.repo.branchtags().get(branch) == ctx.node()
@@ -27,7 +27,6 @@
 +                         edges=edgedata,
 +                         row=row,
 +                         nextrow=row+1,
-+                         bg_height=bg_height,
 +                         desc=desc,
 +                         user=user,
 +                         age=age,
@@ -54,7 +53,7 @@
      doc = e[0].__doc__
 diff -r 55982f62651f mercurial/templates/static/mercurial.js
 --- a/mercurial/templates/static/mercurial.js	Wed Apr 18 01:20:16 2012 +0300
-+++ b/mercurial/templates/static/mercurial.js	Sat Apr 28 01:19:59 2012 +0200
++++ b/mercurial/templates/static/mercurial.js	Sat Apr 28 01:32:46 2012 +0200
 @@ -108,21 +108,22 @@
  			this.bg[1] += this.bg_height;
  			
@@ -123,3 +122,24 @@
  }
  
  
+diff -r 55982f62651f tests/test-hgweb-commands.t
+--- a/tests/test-hgweb-commands.t	Wed Apr 18 01:20:16 2012 +0300
++++ b/tests/test-hgweb-commands.t	Sat Apr 28 01:32:46 2012 +0200
+@@ -957,7 +957,7 @@
+   <script>
+   <!-- hide script content
+   
+-  var data = [["ba87b23d29ca", [0, 1], [[0, 0, 1, 3, "FF0000"]], "branch", "test", "1970-01-01", ["unstable", true], ["tip"], ["something"]], ["1d22e65f027e", [0, 1], [[0, 0, 1, 3, ""]], "branch", "test", "1970-01-01", ["stable", true], [], []], ["a4f92ed23982", [0, 1], [[0, 0, 1, 3, ""]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], [], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"], ["anotherthing"]]];
++  var data = [{"node": "ba87b23d29ca", "branches": [{"name": "unstable"}], "desc": "branch", "tags": [{"name": "tip"}], "color": 1, "age": "1970-01-01", "inbranch": [], "nextrow": 1, "edges": [{"color": 1, "width": 3, "nextcol": 0, "bcolor": "FF0000", "col": 0}], "user": "test", "branchtip": true, "bookmarks": [{"name": "something"}], "branchname": "unstable", "col": 0, "row": 0}, {"node": "1d22e65f027e", "branches": [{"name": "stable"}], "desc": "branch", "tags": [], "color": 1, "age": "1970-01-01", "inbranch": [], "nextrow": 2, "edges": [{"color": 1, "width": 3, "nextcol": 0, "bcolor": "", "col": 0}], "user": "test", "branchtip": true, "bookmarks": [], "branchname": "stable", "col": 0, "row": 1}, {"node": "a4f92ed23982", "branches": [{"name": "default"}], "desc": "Added tag 1.0 for changeset 2ef0ac749a14", "tags": [], "color": 1, "age": "1970-01-01", "inbranch": [], "nextrow": 3, "edges": [{"color": 1, "width": 3, "nextcol": 0, "bcolor": "", "col": 0}], "user": "test", "branchtip": true, "bookmarks": [], "branchname": "default", "col": 0, "row": 2}, {"node": "2ef0ac749a14", "branches": [], "desc": "base", "tags": [{"name": "1.0"}], "color": 1, "age": "1970-01-01", "inbranch": [], "nextrow": 4, "edges": [], "user": "test", "branchtip": false, "bookmarks": [{"name": "anotherthing"}], "branchname": "default", "col": 0, "row": 3}];
+   var graph = new Graph();
+   graph.scale(39);
+   
+@@ -1214,7 +1214,7 @@
+ 
+   $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT '/graph/' \
+   >     | grep '^var data ='
+-  var data = [["548001d11f45", [0, 1], [[0, 0, 1, -1, ""]], "\u80fd", "test", "1970-01-01", ["unstable", true], ["tip"], ["something"]], ["ba87b23d29ca", [0, 1], [[0, 0, 1, 3, "FF0000"]], "branch", "test", "1970-01-01", ["unstable", false], [], []], ["1d22e65f027e", [0, 1], [[0, 0, 1, 3, ""]], "branch", "test", "1970-01-01", ["stable", true], [], []], ["a4f92ed23982", [0, 1], [[0, 0, 1, 3, ""]], "Added tag 1.0 for changeset 2ef0ac749a14", "test", "1970-01-01", ["default", true], [], []], ["2ef0ac749a14", [0, 1], [], "base", "test", "1970-01-01", ["default", false], ["1.0"], ["anotherthing"]]];
++  var data = [{"node": "548001d11f45", "branches": [{"name": "unstable"}], "desc": "\u80fd", "tags": [{"name": "tip"}], "color": 1, "age": "1970-01-01", "inbranch": [], "nextrow": 1, "edges": [{"color": 1, "width": -1, "nextcol": 0, "bcolor": "", "col": 0}], "user": "test", "branchtip": true, "bookmarks": [{"name": "something"}], "branchname": "unstable", "col": 0, "row": 0}, {"node": "ba87b23d29ca", "branches": [], "desc": "branch", "tags": [], "color": 1, "age": "1970-01-01", "inbranch": [{"name": "unstable"}], "nextrow": 2, "edges": [{"color": 1, "width": 3, "nextcol": 0, "bcolor": "FF0000", "col": 0}], "user": "test", "branchtip": false, "bookmarks": [], "branchname": "unstable", "col": 0, "row": 1}, {"node": "1d22e65f027e", "branches": [{"name": "stable"}], "desc": "branch", "tags": [], "color": 1, "age": "1970-01-01", "inbranch": [], "nextrow": 3, "edges": [{"color": 1, "width": 3, "nextcol": 0, "bcolor": "", "col": 0}], "user": "test", "branchtip": true, "bookmarks": [], "branchname": "stable", "col": 0, "row": 2}, {"node": "a4f92ed23982", "branches": [{"name": "default"}], "desc": "Added tag 1.0 for changeset 2ef0ac749a14", "tags": [], "color": 1, "age": "1970-01-01", "inbranch": [], "nextrow": 4, "edges": [{"color": 1, "width": 3, "nextcol": 0, "bcolor": "", "col": 0}], "user": "test", "branchtip": true, "bookmarks": [], "branchname": "default", "col": 0, "row": 3}, {"node": "2ef0ac749a14", "branches": [], "desc": "base", "tags": [{"name": "1.0"}], "color": 1, "age": "1970-01-01", "inbranch": [], "nextrow": 5, "edges": [], "user": "test", "branchtip": false, "bookmarks": [{"name": "anotherthing"}], "branchname": "default", "col": 0, "row": 4}];
+ 
+ capabilities
+