upstream/mercurial-mirror Files · mercurial/templates/monoblue/changeset.tmpl

tests: update divergence test for `hg fix` to actually result in divergence...

tests: update divergence test for `hg fix` to actually result in divergence We have a test that checks that `hg fix` errors out if it might cause divergence. However, the test simply prunes the commit it then tries to fix, so fixing it wouldn't actually cause divergence. That works because the implementation is simple enough that it doesn't notice the difference. I'm about to make the implementation smarter, so let's fix the test first. Differential Revision: https://phab.mercurial-scm.org/D10267

av6 - - Load All Authors

File last commit:

r37042:7c18798f default


                r47594:d083c120

default

Download file

             changeset.tmpl
        
                    67 lines
            
             | 2.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / changeset.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: changeset {rev}:{node|short}</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 id="container">

          <div class="page-header">

              <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset</h1>

              {searchform}

              <ul class="page-nav">

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

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

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

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

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

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

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

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

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

              </ul>

          </div>

          <ul class="submenu">

              <li class="current">changeset</li>

              <li><a href="{url|urlescape}raw-rev/{symrev}">raw</a></li>

              {archives%archiveentry}

          </ul>

          <h2 class="no-link no-border">changeset</h2>

          <h3 class="changeset">

              <a href="{url|urlescape}raw-rev/{node|short}">

                  {desc|strip|escape|firstline|nonempty}

                  {alltags}

              </a>

          </h3>

          <p class="changeset-age"><span class="age">{date|rfc822date}</span></p>

          <dl class="overview">

              <dt>author</dt>

              <dd>{author|obfuscate}</dd>

              <dt>date</dt>

              <dd class="date age">{date|rfc822date}</dd>

              {branch%changesetbranch}

              <dt>changeset {rev}</dt>

              <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>

              {if(obsolete, succsandmarkers%obsfateentry)}

              {if(instabilities, whyunstable%whyunstableentry)}

              {ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}

              {child%changesetchild}

          </dl>

          <p class="description">{desc|strip|escape|websub|addbreaks|nonempty}</p>

          <table>

          {files}

          </table>

          <div class="diff diffblocks">

          {diff}

          </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}: changeset {rev}:{node\|short}</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 id="container">
				<div class="page-header">
				<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / changeset</h1>

				{searchform}

				<ul class="page-nav">
				<li><a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a></li>
				<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a></li>
				<li><a href="{url\|urlescape}changelog{sessionvars%urlparameter}">changelog</a></li>
				<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
				<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
				<li><a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
				<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
				<li><a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li>
				<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				</div>

				<ul class="submenu">
				<li class="current">changeset</li>
				<li><a href="{url\|urlescape}raw-rev/{symrev}">raw</a></li>
				{archives%archiveentry}
				</ul>

				<h2 class="no-link no-border">changeset</h2>

				<h3 class="changeset">
				<a href="{url\|urlescape}raw-rev/{node\|short}">
				{desc\|strip\|escape\|firstline\|nonempty}
				{alltags}
				</a>
				</h3>
				<p class="changeset-age"><span class="age">{date\|rfc822date}</span></p>

				<dl class="overview">
				<dt>author</dt>
				<dd>{author\|obfuscate}</dd>
				<dt>date</dt>
				<dd class="date age">{date\|rfc822date}</dd>
				{branch%changesetbranch}
				<dt>changeset {rev}</dt>
				<dd><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></dd>
				{if(obsolete, succsandmarkers%obsfateentry)}
				{if(instabilities, whyunstable%whyunstableentry)}
				{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}
				{child%changesetchild}
				</dl>

				<p class="description">{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</p>

				<table>
				{files}
				</table>

				<div class="diff diffblocks">
				{diff}
				</div>

				{footer}