# HG changeset patch # User Anton Shestakov # Date 2015-06-16 05:59:49 # Node ID 0cdcbc477cacdf24943a81e3e94b4ae3a0eb097b # Parent 1cac419ab8313199c87868c9c32295228be19342 hgweb: don't dereference symbolic revision in monoblue style Let's make monoblue templates use symbolic revision in navigation links. The majority of links (log, filelog, annotate, etc) still use node hashes. Some pages don't have permanent links to current node hash (so it's not very easy to go from /rev/tip to /rev/), this will be addressed in future patches. diff --git a/mercurial/templates/monoblue/changelog.tmpl b/mercurial/templates/monoblue/changelog.tmpl --- a/mercurial/templates/monoblue/changelog.tmpl +++ b/mercurial/templates/monoblue/changelog.tmpl @@ -21,11 +21,11 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • {archives%archiveentry}
  • help
  • diff --git a/mercurial/templates/monoblue/changeset.tmpl b/mercurial/templates/monoblue/changeset.tmpl --- a/mercurial/templates/monoblue/changeset.tmpl +++ b/mercurial/templates/monoblue/changeset.tmpl @@ -21,18 +21,18 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • help
  • diff --git a/mercurial/templates/monoblue/fileannotate.tmpl b/mercurial/templates/monoblue/fileannotate.tmpl --- a/mercurial/templates/monoblue/fileannotate.tmpl +++ b/mercurial/templates/monoblue/fileannotate.tmpl @@ -21,22 +21,22 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • help
  • diff --git a/mercurial/templates/monoblue/filecomparison.tmpl b/mercurial/templates/monoblue/filecomparison.tmpl --- a/mercurial/templates/monoblue/filecomparison.tmpl +++ b/mercurial/templates/monoblue/filecomparison.tmpl @@ -21,22 +21,22 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • help
  • diff --git a/mercurial/templates/monoblue/filediff.tmpl b/mercurial/templates/monoblue/filediff.tmpl --- a/mercurial/templates/monoblue/filediff.tmpl +++ b/mercurial/templates/monoblue/filediff.tmpl @@ -21,22 +21,22 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • help
  • diff --git a/mercurial/templates/monoblue/filelog.tmpl b/mercurial/templates/monoblue/filelog.tmpl --- a/mercurial/templates/monoblue/filelog.tmpl +++ b/mercurial/templates/monoblue/filelog.tmpl @@ -21,21 +21,21 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • help
  • diff --git a/mercurial/templates/monoblue/filerevision.tmpl b/mercurial/templates/monoblue/filerevision.tmpl --- a/mercurial/templates/monoblue/filerevision.tmpl +++ b/mercurial/templates/monoblue/filerevision.tmpl @@ -21,22 +21,22 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • help
  • diff --git a/mercurial/templates/monoblue/graph.tmpl b/mercurial/templates/monoblue/graph.tmpl --- a/mercurial/templates/monoblue/graph.tmpl +++ b/mercurial/templates/monoblue/graph.tmpl @@ -26,7 +26,7 @@
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • help
  • @@ -99,8 +99,8 @@
    - less - more + less + more | {changenav%navgraph}
    diff --git a/mercurial/templates/monoblue/manifest.tmpl b/mercurial/templates/monoblue/manifest.tmpl --- a/mercurial/templates/monoblue/manifest.tmpl +++ b/mercurial/templates/monoblue/manifest.tmpl @@ -21,7 +21,7 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • @@ -31,7 +31,7 @@ @@ -43,7 +43,7 @@ drwxr-xr-x - [up] + [up]   {dentries%direntry} diff --git a/mercurial/templates/monoblue/map b/mercurial/templates/monoblue/map --- a/mercurial/templates/monoblue/map +++ b/mercurial/templates/monoblue/map @@ -66,21 +66,21 @@ direntry = ' - {basename|escape} - {emptydirs|escape} + {basename|escape} + {emptydirs|escape} - files + files ' fileentry = ' {permissions|permissions} {date|isodate} {size} - {basename|escape} + {basename|escape} - file | - revisions | - annotate + file | + revisions | + annotate ' filerevision = filerevision.tmpl @@ -258,7 +258,7 @@ filelogentry = ' {rename%filelogrename} ' -archiveentry = '
  • {type|escape}
  • ' +archiveentry = '
  • {type|escape}
  • ' indexentry = ' {name|escape} diff --git a/mercurial/templates/monoblue/shortlog.tmpl b/mercurial/templates/monoblue/shortlog.tmpl --- a/mercurial/templates/monoblue/shortlog.tmpl +++ b/mercurial/templates/monoblue/shortlog.tmpl @@ -21,11 +21,11 @@
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • -
  • files
  • +
  • files
  • {archives%archiveentry}
  • help
  • diff --git a/tests/test-hgweb-descend-empties.t b/tests/test-hgweb-descend-empties.t --- a/tests/test-hgweb-descend-empties.t +++ b/tests/test-hgweb-descend-empties.t @@ -294,7 +294,7 @@ manifest with descending (monoblue)
  • summary
  • shortlog
  • changelog
  • -
  • graph
  • +
  • graph
  • tags
  • bookmarks
  • branches
  • @@ -304,7 +304,7 @@ manifest with descending (monoblue) @@ -316,7 +316,7 @@ manifest with descending (monoblue) drwxr-xr-x - [up] + [up]   @@ -325,30 +325,30 @@ manifest with descending (monoblue) - a1 - a2/a3/a4 + a1 + a2/a3/a4 - files + files drwxr-xr-x - b1 - b2/b3 + b1 + b2/b3 - files + files drwxr-xr-x - d1 - d2 + d1 + d2 - files + files diff --git a/tests/test-hgweb-symrev.t b/tests/test-hgweb-symrev.t --- a/tests/test-hgweb-symrev.t +++ b/tests/test-hgweb-symrev.t @@ -619,8 +619,8 @@ Set up the repo files $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'shortlog?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • +
  • graph
  • +
  • files
  • zip
  • changeset | @@ -634,8 +634,8 @@ Set up the repo (0) tip $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'log?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • +
  • graph
  • +
  • files
  • zip
  • third default tip

    second xyzzy

    @@ -643,9 +643,9 @@ Set up the repo (0) tip $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'graph?style=monoblue' | egrep $REVLINKS -
  • files
  • - less - more +
  • files
  • + less + more | (0) tip $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'tags?style=monoblue' | egrep $REVLINKS @@ -667,17 +667,17 @@ Set up the repo files $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • changeset
  • -
  • zip
  • - [up] - dir - - files - foo - file | - revisions | - annotate +
  • graph
  • +
  • changeset
  • +
  • zip
  • + [up] + dir + + files + foo + file | + revisions | + annotate $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'shortlog?style=monoblue&rev=all()' | egrep $REVLINKS
  • zip
  • @@ -686,10 +686,10 @@ Set up the repo

    first

    $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'rev/xyzzy?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • -
  • raw
  • -
  • zip
  • +
  • graph
  • +
  • files
  • +
  • raw
  • +
  • zip
  • second xyzzy

    43c799df6e75
    9d8c40cba617
    @@ -701,9 +701,9 @@ Set up the repo revisions $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'shortlog/xyzzy?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • -
  • zip
  • +
  • graph
  • +
  • files
  • +
  • zip
  • changeset | files @@ -713,51 +713,51 @@ Set up the repo (0) tip $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'log/xyzzy?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • -
  • zip
  • +
  • graph
  • +
  • files
  • +
  • zip
  • second xyzzy

    first

    (0) tip $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'graph/xyzzy?style=monoblue' | egrep $REVLINKS -
  • files
  • - less - more +
  • files
  • + less + more | (0) tip $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/xyzzy?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • changeset
  • -
  • zip
  • - [up] - dir - - files - foo - file | - revisions | - annotate +
  • graph
  • +
  • changeset
  • +
  • zip
  • + [up] + dir + + files + foo + file | + revisions | + annotate $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/xyzzy/foo?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • -
  • revisions
  • -
  • annotate
  • -
  • diff
  • -
  • comparison
  • -
  • raw
  • +
  • graph
  • +
  • files
  • +
  • revisions
  • +
  • annotate
  • +
  • diff
  • +
  • comparison
  • +
  • raw
  • a7c1559b7bba
    9d8c40cba617 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'log/xyzzy/foo?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • -
  • file
  • -
  • annotate
  • -
  • diff
  • -
  • comparison
  • +
  • graph
  • +
  • files
  • +
  • file
  • +
  • annotate
  • +
  • diff
  • +
  • comparison
  • rss
  • file | diff | annotate @@ -766,13 +766,13 @@ Set up the repo (0)tip $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'annotate/xyzzy/foo?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • -
  • file
  • -
  • revisions
  • -
  • diff
  • -
  • comparison
  • -
  • raw
  • +
  • graph
  • +
  • files
  • +
  • file
  • +
  • revisions
  • +
  • diff
  • +
  • comparison
  • +
  • raw
  • a7c1559b7bba
    9d8c40cba617 @@ -780,25 +780,25 @@ Set up the repo graph -
  • files
  • -
  • file
  • -
  • revisions
  • -
  • annotate
  • -
  • comparison
  • -
  • raw
  • +
  • graph
  • +
  • files
  • +
  • file
  • +
  • revisions
  • +
  • annotate
  • +
  • comparison
  • +
  • raw
  • a7c1559b7bba
    43c799df6e75
    9d8c40cba617
    $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'comparison/xyzzy/foo?style=monoblue' | egrep $REVLINKS -
  • graph
  • -
  • files
  • -
  • file
  • -
  • revisions
  • -
  • annotate
  • -
  • diff
  • -
  • raw
  • +
  • graph
  • +
  • files
  • +
  • file
  • +
  • revisions
  • +
  • annotate
  • +
  • diff
  • +
  • raw
  • a7c1559b7bba
    43c799df6e75
    9d8c40cba617