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

graftcopies: remove `skip` and `repo` arguments...

graftcopies: remove `skip` and `repo` arguments The `skip` argument was added in (rebase: fix bug that caused transitive copy records to disappear (issue4192), 2014-06-07) in order to fix https://bz.mercurial-scm.org/show_bug.cgi?id=4192. I ran tests at that commit without the `skiprev` argument and the only difference I noticed was that `test-rebase-collapse.t` failed differently, in the call that is now on line 501. Without the `skiprev` argument, that call would end up creating another commit because it tried to record an invalid copy. With the previous patch in this series, such invalid copies are no longer recorded, so it seems we don't need the `skip` argument anymore. I also removed the `repo` argument since that also becomes unused with the removal of the `skip` argument. Differential Revision: https://phab.mercurial-scm.org/D7860

Gregory Szorc - - Load All Authors

File last commit:

r32759:265196cd default


                r44551:833210fb

default

Download file

             filediff.tmpl
        
                    52 lines
            
             | 2.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / filediff.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: diff {file|escape}</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} / file diff</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}log{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}{path|urlescape}{sessionvars%urlparameter}">files</a></li>

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

              </ul>

          </div>

          <ul class="submenu">

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

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

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

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

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

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

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

          </ul>

          <h2 class="no-link no-border">diff: {file|escape}</h2>

          <h3 class="changeset">{file|escape}</h3>

          <dl class="overview">

              {branch%filerevbranch}

              <dt>changeset {rev}</dt>

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

              {parent%filediffparent}

              {child%filediffchild}

          </dl>

          <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}: diff {file\|escape}</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} / file diff</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}log{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}{path\|urlescape}{sessionvars%urlparameter}">files</a></li>
				<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
				</ul>
				</div>

				<ul class="submenu">
				<li><a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
				<li><a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a></li>
				<li><a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a></li>
				<li><a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
				<li class="current">diff</li>
				<li><a href="{url\|urlescape}comparison/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">comparison</a></li>
				<li><a href="{url\|urlescape}raw-diff/{symrev}/{file\|urlescape}">raw</a></li>
				</ul>

				<h2 class="no-link no-border">diff: {file\|escape}</h2>
				<h3 class="changeset">{file\|escape}</h3>

				<dl class="overview">
				{branch%filerevbranch}
				<dt>changeset {rev}</dt>
				<dd><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></dd>
				{parent%filediffparent}
				{child%filediffchild}
				</dl>

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

				{footer}