MercurialWebTheme

Changeset

50:5a0e814ea2b8
2011-11-30 Paul Boddie raw files shortlog changelog graph Updated the patches to work against the 2.0 era crew repository.
patches/patch-hgweb-webcommands-SVG.diff (file) patches/patch-hgweb-webcommands-blockno.diff (file)
     1.1 --- a/patches/patch-hgweb-webcommands-SVG.diff	Sun Nov 27 22:19:28 2011 +0100
     1.2 +++ b/patches/patch-hgweb-webcommands-SVG.diff	Wed Nov 30 00:08:40 2011 +0100
     1.3 @@ -1,7 +1,14 @@
     1.4 -diff -r b2d4400398f3 mercurial/hgweb/webcommands.py
     1.5 ---- a/mercurial/hgweb/webcommands.py	Tue Sep 27 18:51:10 2011 +0200
     1.6 -+++ b/mercurial/hgweb/webcommands.py	Sun Oct 02 16:41:16 2011 +0200
     1.7 -@@ -770,6 +770,9 @@
     1.8 +# HG changeset patch
     1.9 +# User Paul Boddie <paul@boddie.org.uk>
    1.10 +# Date 1322607302 -3600
    1.11 +# Node ID 160b604c1b8f8066976e86c63ece2062f075d1b6
    1.12 +# Parent  ad686c818e1c7d5ed0335327321003ba8ea04664
    1.13 +hgweb: Provide SVG-related data to the output of the graph command
    1.14 +
    1.15 +diff -r ad686c818e1c -r 160b604c1b8f mercurial/hgweb/webcommands.py
    1.16 +--- a/mercurial/hgweb/webcommands.py	Fri Nov 25 02:11:12 2011 +0100
    1.17 ++++ b/mercurial/hgweb/webcommands.py	Tue Nov 29 23:55:02 2011 +0100
    1.18 +@@ -772,6 +772,9 @@
    1.19       tree = list(graphmod.colored(dag))
    1.20       canvasheight = (len(tree) + 1) * bg_height - 27
    1.21       data = []
    1.22 @@ -11,7 +18,7 @@
    1.23       for (id, type, ctx, vtx, edges) in tree:
    1.24           if type != graphmod.CHANGESET:
    1.25               continue
    1.26 -@@ -782,11 +785,29 @@
    1.27 +@@ -784,11 +787,30 @@
    1.28           branch = branch, web.repo.branchtags().get(branch) == ctx.node()
    1.29           data.append((node, vtx, edges, desc, user, age, branch, ctx.tags(),
    1.30                        ctx.bookmarks()))
    1.31 @@ -26,6 +33,7 @@
    1.32  +            desc=desc,
    1.33  +            user=user,
    1.34  +            age=age,
    1.35 ++            bookmarks=webutil.nodebookmarksdict(web.repo, ctx.node()),
    1.36  +            branches=webutil.nodebranchdict(web.repo, ctx),
    1.37  +            inbranch=webutil.nodeinbranch(web.repo, ctx),
    1.38  +            tags=webutil.nodetagsdict(web.repo, ctx.node())))
     2.1 --- a/patches/patch-hgweb-webcommands-blockno.diff	Sun Nov 27 22:19:28 2011 +0100
     2.2 +++ b/patches/patch-hgweb-webcommands-blockno.diff	Wed Nov 30 00:08:40 2011 +0100
     2.3 @@ -1,6 +1,13 @@
     2.4 -diff -r 8a4044aacc27 mercurial/hgweb/webcommands.py
     2.5 ---- a/mercurial/hgweb/webcommands.py	Sun Oct 02 16:41:33 2011 +0200
     2.6 -+++ b/mercurial/hgweb/webcommands.py	Sun Oct 02 16:42:11 2011 +0200
     2.7 +# HG changeset patch
     2.8 +# User Paul Boddie <paul@boddie.org.uk>
     2.9 +# Date 1322607647 -3600
    2.10 +# Node ID 387585e3105efc9df33e947527950ced65320201
    2.11 +# Parent  ad686c818e1c7d5ed0335327321003ba8ea04664
    2.12 +hgweb: Introduce a blockno variable in the changeset's files list and in the diffs webcommand
    2.13 +
    2.14 +diff -r ad686c818e1c -r 387585e3105e mercurial/hgweb/webcommands.py
    2.15 +--- a/mercurial/hgweb/webcommands.py	Fri Nov 25 02:11:12 2011 +0100
    2.16 ++++ b/mercurial/hgweb/webcommands.py	Wed Nov 30 00:00:47 2011 +0100
    2.17  @@ -261,10 +261,10 @@
    2.18   
    2.19       files = []
    2.20 @@ -14,9 +21,9 @@
    2.21                             parity=parity.next()))
    2.22   
    2.23       style = web.config('web', 'style', 'paper')
    2.24 -diff -r 8a4044aacc27 mercurial/hgweb/webutil.py
    2.25 ---- a/mercurial/hgweb/webutil.py	Sun Oct 02 16:41:33 2011 +0200
    2.26 -+++ b/mercurial/hgweb/webutil.py	Sun Oct 02 16:42:11 2011 +0200
    2.27 +diff -r ad686c818e1c -r 387585e3105e mercurial/hgweb/webutil.py
    2.28 +--- a/mercurial/hgweb/webutil.py	Fri Nov 25 02:11:12 2011 +0100
    2.29 ++++ b/mercurial/hgweb/webutil.py	Wed Nov 30 00:00:47 2011 +0100
    2.30  @@ -173,8 +173,7 @@
    2.31               start += 1
    2.32