upstream/mercurial-mirror Files · templates/gitweb/error.tmpl

update: allow branch crossing without -c or -C, with no uncommitted changes...

update: allow branch crossing without -c or -C, with no uncommitted changes Update will now allow crossing branches within the same named branch, when given a specific revision, if the working dir is clean, without requiring the -c or -C option. Abort if no revision is given and this would cross branches. Minor change to abort message if uncommitted changes are found. Modify test-update-branches and output to reflect the altered case. Modify test-merge5.out to reflect the altered case. Modify test-up-local-change.out with new message.

Dirkjan Ochtman - - Load All Authors

File last commit:

r8936:1de6e7e1 default


                r9717:68a1b9d0

default

Download file

             error.tmpl
        
                    25 lines
            
             | 963 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / templates / gitweb / error.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: Error</title>

      <link rel="alternate" type="application/atom+xml"

         href="{url}atom-log" title="Atom feed for {repo|escape}"/>

      <link rel="alternate" type="application/rss+xml"

         href="{url}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div class="page_header">

      <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / error

      </div>

      <div class="page_nav">

      <a href="{url}summary{sessionvars%urlparameter}">summary</a> | <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> | <a href="{url}log{sessionvars%urlparameter}">changelog</a> | <a href="{url}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a><br/>

      </div>

      <div class="page_body">

      <br/>

      <i>An error occurred while processing your request</i><br/>

      <br/>

      {error|escape}

      </div>

      {footer}

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				{header}
				<title>{repo\|escape}: Error</title>
				<link rel="alternate" type="application/atom+xml"
				href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
				<link rel="alternate" type="application/rss+xml"
				href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
				</head>
				<body>

				<div class="page_header">
				<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / error
				</div>

				<div class="page_nav">
				<a href="{url}summary{sessionvars%urlparameter}">summary</a> \| <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> \| <a href="{url}log{sessionvars%urlparameter}">changelog</a> \| <a href="{url}tags{sessionvars%urlparameter}">tags</a> \| <a href="{url}file/{node\|short}{sessionvars%urlparameter}">files</a><br/>
				</div>

				<div class="page_body">
				<br/>
				<i>An error occurred while processing your request</i><br/>
				<br/>
				{error\|escape}
				</div>

				{footer}