upstream/mercurial-mirror Files · mercurial/templates/spartan/changelog.tmpl

largefiles: better handling of merge of largefiles that not are available...

largefiles: better handling of merge of largefiles that not are available Before, when merging revisions with missing largefiles, the missing largefiles would be fetched as a part of the merge. If that failed (for example because the main repository temporarily was unavailable), the largefile would be left missing. However, the next commit would abort and (seemed to) fail when markcommitted tried to mark the standin file as normal and thus had to hash the largefile that didn't exist. (Actually, the commit would succeed but the largefile update that follows right after the commit transaction would abort - quite confusing.) To fix that, make sure that synclfdirstate only marks files as normal if they actually exist.

av6 - - Load All Authors

File last commit:

r25794:90214844 default


                r26627:832c98d7

default

Download file

             changelog.tmpl
        
                    44 lines
            
             | 1.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / changelog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

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

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

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

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

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

      </head>

      <body>

      <div class="buttons">

      <a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>

      <a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>

      <a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a>

      <a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a>

      <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>

      {archives%archiveentry}

      <a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>

      <a type="application/rss+xml" href="{url|urlescape}rss-log">rss</a>

      <a type="application/atom+xml" href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}">atom</a>

      </div>

      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changelog</h2>

      <form action="{url|urlescape}log">

      {sessionvars%hiddenformentry}

      <p>

      <label for="search1">search:</label>

      <input name="rev" id="search1" type="text" size="30">

      navigate: <small class="navigate">{changenav%nav}</small>

      </p>

      </form>

      {entries%changelogentry}

      <form action="{url|urlescape}log">

      {sessionvars%hiddenformentry}

      <p>

      <label for="search2">search:</label>

      <input name="rev" id="search2" type="text" size="30">

      navigate: <small class="navigate">{changenav%nav}</small>

      </p>

      </form>

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

				<div class="buttons">
				<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
				<a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a>
				<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
				<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
				<a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>
				{archives%archiveentry}
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				<a type="application/rss+xml" href="{url\|urlescape}rss-log">rss</a>
				<a type="application/atom+xml" href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}">atom</a>
				</div>

				<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changelog</h2>

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p>
				<label for="search1">search:</label>
				<input name="rev" id="search1" type="text" size="30">
				navigate: <small class="navigate">{changenav%nav}</small>
				</p>
				</form>

				{entries%changelogentry}

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p>
				<label for="search2">search:</label>
				<input name="rev" id="search2" type="text" size="30">
				navigate: <small class="navigate">{changenav%nav}</small>
				</p>
				</form>

				{footer}