diff --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -24,6 +24,30 @@ perms = { 'pushkey': 'push', } +def makebreadcrumb(url): + '''Return a 'URL breadcrumb' list + + A 'URL breadcrumb' is a list of URL-name pairs, + corresponding to each of the path items on a URL. + This can be used to create path navigation entries. + ''' + if url.endswith('/'): + url = url[:-1] + relpath = url + if relpath.startswith('/'): + relpath = relpath[1:] + + breadcrumb = [] + urlel = url + pathitems = [''] + relpath.split('/') + for pathel in reversed(pathitems): + if not pathel or not urlel: + break + breadcrumb.append({'url': urlel, 'name': pathel}) + urlel = os.path.dirname(urlel) + return reversed(breadcrumb) + + class hgweb(object): def __init__(self, repo, name=None, baseui=None): if isinstance(repo, str): @@ -285,7 +309,8 @@ class hgweb(object): "header": header, "footer": footer, "motd": motd, - "sessionvars": sessionvars + "sessionvars": sessionvars, + "pathdef": makebreadcrumb(req.url), }) return tmpl diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -12,7 +12,7 @@ from mercurial import ui, hg, scmutil, u from mercurial import error, encoding from common import ErrorResponse, get_mtime, staticfile, paritygen, \ get_contact, HTTP_OK, HTTP_NOT_FOUND, HTTP_SERVER_ERROR -from hgweb_mod import hgweb +from hgweb_mod import hgweb, makebreadcrumb from request import wsgirequest import webutil @@ -395,6 +395,7 @@ class hgwebdir(object): self.updatereqenv(req.env) return tmpl("index", entries=entries, subdir=subdir, + pathdef=makebreadcrumb('/' + subdir), sortcolumn=sortcolumn, descending=descending, **dict(sort)) diff --git a/mercurial/templates/coal/map b/mercurial/templates/coal/map --- a/mercurial/templates/coal/map +++ b/mercurial/templates/coal/map @@ -223,3 +223,4 @@ notfound = ../paper/notfound.tmpl error = ../paper/error.tmpl urlparameter = '{separator}{name}={value|urlescape}' hiddenformentry = '' +breadcrumb = '> {name} ' diff --git a/mercurial/templates/gitweb/bookmarks.tmpl b/mercurial/templates/gitweb/bookmarks.tmpl --- a/mercurial/templates/gitweb/bookmarks.tmpl +++ b/mercurial/templates/gitweb/bookmarks.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / bookmarks +Mercurial +Mercurial {pathdef%breadcrumb} / bookmarks
diff --git a/mercurial/templates/gitweb/branches.tmpl b/mercurial/templates/gitweb/branches.tmpl --- a/mercurial/templates/gitweb/branches.tmpl +++ b/mercurial/templates/gitweb/branches.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / branches +Mercurial +Mercurial {pathdef%breadcrumb} / branches
diff --git a/mercurial/templates/gitweb/changelog.tmpl b/mercurial/templates/gitweb/changelog.tmpl --- a/mercurial/templates/gitweb/changelog.tmpl +++ b/mercurial/templates/gitweb/changelog.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / changelog +Mercurial +Mercurial {pathdef%breadcrumb} / changelog
diff --git a/mercurial/templates/gitweb/changeset.tmpl b/mercurial/templates/gitweb/changeset.tmpl --- a/mercurial/templates/gitweb/changeset.tmpl +++ b/mercurial/templates/gitweb/changeset.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / changeset +Mercurial +Mercurial {pathdef%breadcrumb} / changeset
diff --git a/mercurial/templates/gitweb/error.tmpl b/mercurial/templates/gitweb/error.tmpl --- a/mercurial/templates/gitweb/error.tmpl +++ b/mercurial/templates/gitweb/error.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / error +Mercurial +Mercurial {pathdef%breadcrumb} / error
diff --git a/mercurial/templates/gitweb/fileannotate.tmpl b/mercurial/templates/gitweb/fileannotate.tmpl --- a/mercurial/templates/gitweb/fileannotate.tmpl +++ b/mercurial/templates/gitweb/fileannotate.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / annotate +Mercurial +Mercurial {pathdef%breadcrumb} / annotate
diff --git a/mercurial/templates/gitweb/filecomparison.tmpl b/mercurial/templates/gitweb/filecomparison.tmpl --- a/mercurial/templates/gitweb/filecomparison.tmpl +++ b/mercurial/templates/gitweb/filecomparison.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / comparison +Mercurial +Mercurial {pathdef%breadcrumb} / comparison
diff --git a/mercurial/templates/gitweb/filediff.tmpl b/mercurial/templates/gitweb/filediff.tmpl --- a/mercurial/templates/gitweb/filediff.tmpl +++ b/mercurial/templates/gitweb/filediff.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / diff +Mercurial +Mercurial {pathdef%breadcrumb} / diff
diff --git a/mercurial/templates/gitweb/filelog.tmpl b/mercurial/templates/gitweb/filelog.tmpl --- a/mercurial/templates/gitweb/filelog.tmpl +++ b/mercurial/templates/gitweb/filelog.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / file revisions +Mercurial +Mercurial {pathdef%breadcrumb} / file revisions
diff --git a/mercurial/templates/gitweb/filerevision.tmpl b/mercurial/templates/gitweb/filerevision.tmpl --- a/mercurial/templates/gitweb/filerevision.tmpl +++ b/mercurial/templates/gitweb/filerevision.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / file revision +Mercurial +Mercurial {pathdef%breadcrumb} / file revision
diff --git a/mercurial/templates/gitweb/graph.tmpl b/mercurial/templates/gitweb/graph.tmpl --- a/mercurial/templates/gitweb/graph.tmpl +++ b/mercurial/templates/gitweb/graph.tmpl @@ -9,7 +9,8 @@
-Mercurial{repo|escape} / graph +Mercurial +Mercurial {pathdef%breadcrumb} / graph
diff --git a/mercurial/templates/gitweb/help.tmpl b/mercurial/templates/gitweb/help.tmpl --- a/mercurial/templates/gitweb/help.tmpl +++ b/mercurial/templates/gitweb/help.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / help +Mercurial +Mercurial {pathdef%breadcrumb} / help
diff --git a/mercurial/templates/gitweb/helptopics.tmpl b/mercurial/templates/gitweb/helptopics.tmpl --- a/mercurial/templates/gitweb/helptopics.tmpl +++ b/mercurial/templates/gitweb/helptopics.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / help +Mercurial +Mercurial {pathdef%breadcrumb} / help
diff --git a/mercurial/templates/gitweb/index.tmpl b/mercurial/templates/gitweb/index.tmpl --- a/mercurial/templates/gitweb/index.tmpl +++ b/mercurial/templates/gitweb/index.tmpl @@ -5,7 +5,7 @@
Mercurial - Repositories list + Mercurial {pathdef%breadcrumb}
diff --git a/mercurial/templates/gitweb/manifest.tmpl b/mercurial/templates/gitweb/manifest.tmpl --- a/mercurial/templates/gitweb/manifest.tmpl +++ b/mercurial/templates/gitweb/manifest.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / files +Mercurial +Mercurial {pathdef%breadcrumb} / files
diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map --- a/mercurial/templates/gitweb/map +++ b/mercurial/templates/gitweb/map @@ -305,3 +305,4 @@ indexarchiveentry = ' ' +breadcrumb = '> {name} ' diff --git a/mercurial/templates/gitweb/search.tmpl b/mercurial/templates/gitweb/search.tmpl --- a/mercurial/templates/gitweb/search.tmpl +++ b/mercurial/templates/gitweb/search.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / search +Mercurial +Mercurial {pathdef%breadcrumb} / search {sessionvars%hiddenformentry} diff --git a/mercurial/templates/gitweb/shortlog.tmpl b/mercurial/templates/gitweb/shortlog.tmpl --- a/mercurial/templates/gitweb/shortlog.tmpl +++ b/mercurial/templates/gitweb/shortlog.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / shortlog +Mercurial +Mercurial {pathdef%breadcrumb} / shortlog
diff --git a/mercurial/templates/gitweb/summary.tmpl b/mercurial/templates/gitweb/summary.tmpl --- a/mercurial/templates/gitweb/summary.tmpl +++ b/mercurial/templates/gitweb/summary.tmpl @@ -8,8 +8,8 @@
-Mercurial{repo|escape} / summary - +Mercurial +Mercurial {pathdef%breadcrumb} / summary {sessionvars%hiddenformentry}
diff --git a/mercurial/templates/gitweb/tags.tmpl b/mercurial/templates/gitweb/tags.tmpl --- a/mercurial/templates/gitweb/tags.tmpl +++ b/mercurial/templates/gitweb/tags.tmpl @@ -8,7 +8,8 @@
-Mercurial{repo|escape} / tags +Mercurial +Mercurial {pathdef%breadcrumb} / tags
diff --git a/mercurial/templates/monoblue/bookmarks.tmpl b/mercurial/templates/monoblue/bookmarks.tmpl --- a/mercurial/templates/monoblue/bookmarks.tmpl +++ b/mercurial/templates/monoblue/bookmarks.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / bookmarks

+

Mercurial {pathdef%breadcrumb} / bookmarks

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/branches.tmpl b/mercurial/templates/monoblue/branches.tmpl --- a/mercurial/templates/monoblue/branches.tmpl +++ b/mercurial/templates/monoblue/branches.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / branches

+

Mercurial {pathdef%breadcrumb} / branches

{sessionvars%hiddenformentry} 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 @@ -7,7 +7,7 @@
-

{repo|escape} / changelog

+

Mercurial {pathdef%breadcrumb} / changelog

{sessionvars%hiddenformentry} 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 @@ -7,7 +7,7 @@
-

{repo|escape} / changeset

+

Mercurial {pathdef%breadcrumb} / changeset

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/error.tmpl b/mercurial/templates/monoblue/error.tmpl --- a/mercurial/templates/monoblue/error.tmpl +++ b/mercurial/templates/monoblue/error.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / not found: {repo|escape}

+

Mercurial {pathdef%breadcrumb} / not found: {repo|escape}

{sessionvars%hiddenformentry} 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 @@ -7,7 +7,7 @@
-

{repo|escape} / annotate

+

Mercurial {pathdef%breadcrumb} / annotate

{sessionvars%hiddenformentry} 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 @@ -7,7 +7,7 @@
-

{repo|escape} / file comparison

+

Mercurial {pathdef%breadcrumb} / file comparison

{sessionvars%hiddenformentry} 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 @@ -7,7 +7,7 @@
-

{repo|escape} / file diff

+

Mercurial {pathdef%breadcrumb} / file diff

{sessionvars%hiddenformentry} 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 @@ -7,7 +7,7 @@
-

{repo|escape} / file revisions

+

Mercurial {pathdef%breadcrumb} / file revisions

{sessionvars%hiddenformentry} 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 @@ -7,7 +7,7 @@
-

{repo|escape} / file revision

+

Mercurial {pathdef%breadcrumb} / file revision

{sessionvars%hiddenformentry} 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 @@ -8,7 +8,7 @@
-

{repo|escape} / graph

+

Mercurial {pathdef%breadcrumb} / graph

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/help.tmpl b/mercurial/templates/monoblue/help.tmpl --- a/mercurial/templates/monoblue/help.tmpl +++ b/mercurial/templates/monoblue/help.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / help

+

Mercurial {pathdef%breadcrumb} / help

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/helptopics.tmpl b/mercurial/templates/monoblue/helptopics.tmpl --- a/mercurial/templates/monoblue/helptopics.tmpl +++ b/mercurial/templates/monoblue/helptopics.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / help

+

Mercurial {pathdef%breadcrumb} / help

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/index.tmpl b/mercurial/templates/monoblue/index.tmpl --- a/mercurial/templates/monoblue/index.tmpl +++ b/mercurial/templates/monoblue/index.tmpl @@ -5,7 +5,7 @@
-

Mercurial Repositories

+

Mercurial {pathdef%breadcrumb}

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 @@ -7,7 +7,7 @@
-

{repo|escape} / files

+

Mercurial {pathdef%breadcrumb} / files

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/map b/mercurial/templates/monoblue/map --- a/mercurial/templates/monoblue/map +++ b/mercurial/templates/monoblue/map @@ -259,3 +259,4 @@ index = index.tmpl urlparameter = '{separator}{name}={value|urlescape}' hiddenformentry = '' graph = graph.tmpl +breadcrumb = '> {name} ' diff --git a/mercurial/templates/monoblue/notfound.tmpl b/mercurial/templates/monoblue/notfound.tmpl --- a/mercurial/templates/monoblue/notfound.tmpl +++ b/mercurial/templates/monoblue/notfound.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / not found: {repo|escape}

+

Mercurial {pathdef%breadcrumb} / not found: {repo|escape}

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/search.tmpl b/mercurial/templates/monoblue/search.tmpl --- a/mercurial/templates/monoblue/search.tmpl +++ b/mercurial/templates/monoblue/search.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / search

+

Mercurial {pathdef%breadcrumb} / search

{sessionvars%hiddenformentry} 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 @@ -7,7 +7,7 @@
-

{repo|escape} / shortlog

+

Mercurial {pathdef%breadcrumb} / shortlog

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/summary.tmpl b/mercurial/templates/monoblue/summary.tmpl --- a/mercurial/templates/monoblue/summary.tmpl +++ b/mercurial/templates/monoblue/summary.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / summary

+

Mercurial {pathdef%breadcrumb} / summary

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/tags.tmpl b/mercurial/templates/monoblue/tags.tmpl --- a/mercurial/templates/monoblue/tags.tmpl +++ b/mercurial/templates/monoblue/tags.tmpl @@ -7,7 +7,7 @@
-

{repo|escape} / tags

+

Mercurial {pathdef%breadcrumb} / tags

{sessionvars%hiddenformentry} diff --git a/mercurial/templates/paper/bookmarks.tmpl b/mercurial/templates/paper/bookmarks.tmpl --- a/mercurial/templates/paper/bookmarks.tmpl +++ b/mercurial/templates/paper/bookmarks.tmpl @@ -32,7 +32,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

bookmarks

diff --git a/mercurial/templates/paper/branches.tmpl b/mercurial/templates/paper/branches.tmpl --- a/mercurial/templates/paper/branches.tmpl +++ b/mercurial/templates/paper/branches.tmpl @@ -32,7 +32,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

branches

diff --git a/mercurial/templates/paper/changeset.tmpl b/mercurial/templates/paper/changeset.tmpl --- a/mercurial/templates/paper/changeset.tmpl +++ b/mercurial/templates/paper/changeset.tmpl @@ -30,7 +30,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag} {changesetbookmark}

diff --git a/mercurial/templates/paper/error.tmpl b/mercurial/templates/paper/error.tmpl --- a/mercurial/templates/paper/error.tmpl +++ b/mercurial/templates/paper/error.tmpl @@ -23,7 +23,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

error

diff --git a/mercurial/templates/paper/fileannotate.tmpl b/mercurial/templates/paper/fileannotate.tmpl --- a/mercurial/templates/paper/fileannotate.tmpl +++ b/mercurial/templates/paper/fileannotate.tmpl @@ -36,7 +36,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

annotate {file|escape} @ {rev}:{node|short}

diff --git a/mercurial/templates/paper/filecomparison.tmpl b/mercurial/templates/paper/filecomparison.tmpl --- a/mercurial/templates/paper/filecomparison.tmpl +++ b/mercurial/templates/paper/filecomparison.tmpl @@ -35,7 +35,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

comparison {file|escape} @ {rev}:{node|short}

diff --git a/mercurial/templates/paper/filediff.tmpl b/mercurial/templates/paper/filediff.tmpl --- a/mercurial/templates/paper/filediff.tmpl +++ b/mercurial/templates/paper/filediff.tmpl @@ -35,7 +35,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

diff {file|escape} @ {rev}:{node|short}

diff --git a/mercurial/templates/paper/filelog.tmpl b/mercurial/templates/paper/filelog.tmpl --- a/mercurial/templates/paper/filelog.tmpl +++ b/mercurial/templates/paper/filelog.tmpl @@ -43,7 +43,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

log {file|escape}

diff --git a/mercurial/templates/paper/filerevision.tmpl b/mercurial/templates/paper/filerevision.tmpl --- a/mercurial/templates/paper/filerevision.tmpl +++ b/mercurial/templates/paper/filerevision.tmpl @@ -34,7 +34,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

view {file|escape} @ {rev}:{node|short}

diff --git a/mercurial/templates/paper/graph.tmpl b/mercurial/templates/paper/graph.tmpl --- a/mercurial/templates/paper/graph.tmpl +++ b/mercurial/templates/paper/graph.tmpl @@ -37,7 +37,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

graph

diff --git a/mercurial/templates/paper/help.tmpl b/mercurial/templates/paper/help.tmpl --- a/mercurial/templates/paper/help.tmpl +++ b/mercurial/templates/paper/help.tmpl @@ -22,7 +22,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

Help: {topic}

diff --git a/mercurial/templates/paper/helptopics.tmpl b/mercurial/templates/paper/helptopics.tmpl --- a/mercurial/templates/paper/helptopics.tmpl +++ b/mercurial/templates/paper/helptopics.tmpl @@ -22,7 +22,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

{sessionvars%hiddenformentry}

diff --git a/mercurial/templates/paper/index.tmpl b/mercurial/templates/paper/index.tmpl --- a/mercurial/templates/paper/index.tmpl +++ b/mercurial/templates/paper/index.tmpl @@ -9,7 +9,7 @@ mercurial
-

Mercurial Repositories

+

Mercurial {pathdef%breadcrumb}

diff --git a/mercurial/templates/paper/manifest.tmpl b/mercurial/templates/paper/manifest.tmpl --- a/mercurial/templates/paper/manifest.tmpl +++ b/mercurial/templates/paper/manifest.tmpl @@ -29,7 +29,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

directory {path|escape} @ {rev}:{node|short} {tags%changelogtag}

diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map --- a/mercurial/templates/paper/map +++ b/mercurial/templates/paper/map @@ -231,3 +231,4 @@ notfound = notfound.tmpl error = error.tmpl urlparameter = '{separator}{name}={value|urlescape}' hiddenformentry = '' +breadcrumb = '> {name} ' diff --git a/mercurial/templates/paper/search.tmpl b/mercurial/templates/paper/search.tmpl --- a/mercurial/templates/paper/search.tmpl +++ b/mercurial/templates/paper/search.tmpl @@ -20,7 +20,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

searching for '{query|escape}'

diff --git a/mercurial/templates/paper/shortlog.tmpl b/mercurial/templates/paper/shortlog.tmpl --- a/mercurial/templates/paper/shortlog.tmpl +++ b/mercurial/templates/paper/shortlog.tmpl @@ -39,7 +39,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

log

diff --git a/mercurial/templates/paper/tags.tmpl b/mercurial/templates/paper/tags.tmpl --- a/mercurial/templates/paper/tags.tmpl +++ b/mercurial/templates/paper/tags.tmpl @@ -31,7 +31,7 @@
-

{repo|escape}

+

Mercurial {pathdef%breadcrumb}

tags

diff --git a/mercurial/templates/spartan/index.tmpl b/mercurial/templates/spartan/index.tmpl --- a/mercurial/templates/spartan/index.tmpl +++ b/mercurial/templates/spartan/index.tmpl @@ -3,7 +3,7 @@ -

Mercurial Repositories

+

Mercurial {pathdef%breadcrumb}

diff --git a/mercurial/templates/spartan/map b/mercurial/templates/spartan/map --- a/mercurial/templates/spartan/map +++ b/mercurial/templates/spartan/map @@ -181,3 +181,4 @@ notfound = notfound.tmpl error = error.tmpl urlparameter = '{separator}{name}={value|urlescape}' hiddenformentry = '' +breadcrumb = '> {name} ' diff --git a/mercurial/templates/static/style-coal.css b/mercurial/templates/static/style-coal.css --- a/mercurial/templates/static/style-coal.css +++ b/mercurial/templates/static/style-coal.css @@ -323,3 +323,11 @@ ul#graphnodes li .info { .block { border-top: 1px solid #999; } + +.breadcrumb { + color: gray; +} + +.breadcrumb a { + color: blue; +} diff --git a/mercurial/templates/static/style-monoblue.css b/mercurial/templates/static/style-monoblue.css --- a/mercurial/templates/static/style-monoblue.css +++ b/mercurial/templates/static/style-monoblue.css @@ -524,3 +524,7 @@ ul#graphnodes li .info { border-top: 1px solid #999; } /** end of comparison **/ + +.breadcrumb a:hover { + text-decoration:underline; +} diff --git a/mercurial/templates/static/style-paper.css b/mercurial/templates/static/style-paper.css --- a/mercurial/templates/static/style-paper.css +++ b/mercurial/templates/static/style-paper.css @@ -318,3 +318,11 @@ ul#graphnodes li .info { .block { border-top: 1px solid #999; } + +.breadcrumb { + color: gray; +} + +.breadcrumb a { + color: blue; +}