# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1322608120 -3600
# Node ID 5a0e814ea2b854108f5567bd4a91f88358b714ad
# Parent  61f5c7bc5ad438b1bd472b4762fc3ee64587857e
Updated the patches to work against the 2.0 era crew repository.

diff -r 61f5c7bc5ad4 -r 5a0e814ea2b8 patches/patch-hgweb-webcommands-SVG.diff
--- a/patches/patch-hgweb-webcommands-SVG.diff	Sun Nov 27 22:19:28 2011 +0100
+++ b/patches/patch-hgweb-webcommands-SVG.diff	Wed Nov 30 00:08:40 2011 +0100
@@ -1,7 +1,14 @@
-diff -r b2d4400398f3 mercurial/hgweb/webcommands.py
---- a/mercurial/hgweb/webcommands.py	Tue Sep 27 18:51:10 2011 +0200
-+++ b/mercurial/hgweb/webcommands.py	Sun Oct 02 16:41:16 2011 +0200
-@@ -770,6 +770,9 @@
+# HG changeset patch
+# User Paul Boddie <paul@boddie.org.uk>
+# Date 1322607302 -3600
+# Node ID 160b604c1b8f8066976e86c63ece2062f075d1b6
+# Parent  ad686c818e1c7d5ed0335327321003ba8ea04664
+hgweb: Provide SVG-related data to the output of the graph command
+
+diff -r ad686c818e1c -r 160b604c1b8f mercurial/hgweb/webcommands.py
+--- a/mercurial/hgweb/webcommands.py	Fri Nov 25 02:11:12 2011 +0100
++++ b/mercurial/hgweb/webcommands.py	Tue Nov 29 23:55:02 2011 +0100
+@@ -772,6 +772,9 @@
      tree = list(graphmod.colored(dag))
      canvasheight = (len(tree) + 1) * bg_height - 27
      data = []
@@ -11,7 +18,7 @@
      for (id, type, ctx, vtx, edges) in tree:
          if type != graphmod.CHANGESET:
              continue
-@@ -782,11 +785,29 @@
+@@ -784,11 +787,30 @@
          branch = branch, web.repo.branchtags().get(branch) == ctx.node()
          data.append((node, vtx, edges, desc, user, age, branch, ctx.tags(),
                       ctx.bookmarks()))
@@ -26,6 +33,7 @@
 +            desc=desc,
 +            user=user,
 +            age=age,
++            bookmarks=webutil.nodebookmarksdict(web.repo, ctx.node()),
 +            branches=webutil.nodebranchdict(web.repo, ctx),
 +            inbranch=webutil.nodeinbranch(web.repo, ctx),
 +            tags=webutil.nodetagsdict(web.repo, ctx.node())))
diff -r 61f5c7bc5ad4 -r 5a0e814ea2b8 patches/patch-hgweb-webcommands-blockno.diff
--- a/patches/patch-hgweb-webcommands-blockno.diff	Sun Nov 27 22:19:28 2011 +0100
+++ b/patches/patch-hgweb-webcommands-blockno.diff	Wed Nov 30 00:08:40 2011 +0100
@@ -1,6 +1,13 @@
-diff -r 8a4044aacc27 mercurial/hgweb/webcommands.py
---- a/mercurial/hgweb/webcommands.py	Sun Oct 02 16:41:33 2011 +0200
-+++ b/mercurial/hgweb/webcommands.py	Sun Oct 02 16:42:11 2011 +0200
+# HG changeset patch
+# User Paul Boddie <paul@boddie.org.uk>
+# Date 1322607647 -3600
+# Node ID 387585e3105efc9df33e947527950ced65320201
+# Parent  ad686c818e1c7d5ed0335327321003ba8ea04664
+hgweb: Introduce a blockno variable in the changeset's files list and in the diffs webcommand
+
+diff -r ad686c818e1c -r 387585e3105e mercurial/hgweb/webcommands.py
+--- a/mercurial/hgweb/webcommands.py	Fri Nov 25 02:11:12 2011 +0100
++++ b/mercurial/hgweb/webcommands.py	Wed Nov 30 00:00:47 2011 +0100
 @@ -261,10 +261,10 @@
  
      files = []
@@ -14,9 +21,9 @@
                            parity=parity.next()))
  
      style = web.config('web', 'style', 'paper')
-diff -r 8a4044aacc27 mercurial/hgweb/webutil.py
---- a/mercurial/hgweb/webutil.py	Sun Oct 02 16:41:33 2011 +0200
-+++ b/mercurial/hgweb/webutil.py	Sun Oct 02 16:42:11 2011 +0200
+diff -r ad686c818e1c -r 387585e3105e mercurial/hgweb/webutil.py
+--- a/mercurial/hgweb/webutil.py	Fri Nov 25 02:11:12 2011 +0100
++++ b/mercurial/hgweb/webutil.py	Wed Nov 30 00:00:47 2011 +0100
 @@ -173,8 +173,7 @@
              start += 1