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

mq: create patch file after commit to import diff of ".hgsubstate" at qrefresh...

mq: create patch file after commit to import diff of ".hgsubstate" at qrefresh Even though the committed revision contains diff of ".hgsubstate", the patch file created by qrefresh doesn't contain it, because: - ".hgsubstate" is not listed up as one of target files of the patch for reasons below, so diff of ".hgsubstate" is not imported into patch file - status of ".hgsubstate" in working directory is usually "clean" - ".hgsubstate" is not specified explicitly by users - the patch file is created before commit processing which updates or creates ".hgsubstate" automatically, so there is no diff for it at that time This patch resolves this problem by: - putting ".hgsubstate" into target list of the patch, if needed: this allows "patch.diff()" to import diff of ".hgsubstate" into patch file. - creating the patch file after commit processing: this updates ".hgsubstate" before "patch.diff()" invocation. For the former fixing, this patch introduces "putsubstate2changes()" to share same implementation with qnew. This is invoked only once per qnew/qrefresh at most, so there is less performance impact. This patch also omits "match" argument for "patch.diff()" invocation, because "patch.diff()" ignores "match" if "changes" is specified.

Brodie Rao - - Load All Authors

File last commit:

r15375:fe9d36a6 stable


                r17152:f287d4a6

default

Download file

             fileannotate.tmpl
        
                    65 lines
            
             | 2.7 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / fileannotate.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: {file|escape}@{node|short} (annotated)</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 id="container">

          <div class="page-header">

              <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / annotate</h1>

              <form action="{url}log">

                  {sessionvars%hiddenformentry}

                  <dl class="search">

                      <dt><label>Search: </label></dt>

                      <dd><input type="text" name="rev" /></dd>

                  </dl>

              </form>

              <ul class="page-nav">

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

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

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

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

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

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

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

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

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

              </ul>

          </div>

          <ul class="submenu">

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

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

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

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

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

          </ul>

          <h2 class="no-link no-border">{file|escape}@{node|short} (annotated)</h2>

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

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

          <dl class="overview">

              <dt>author</dt>

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

              <dt>date</dt>

              <dd>{date|rfc822date}</dd>

              {branch%filerevbranch}

              <dt>changeset {rev}</dt>

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

              {parent%fileannotateparent}

              {child%fileannotatechild}

              <dt>permissions</dt>

              <dd>{permissions|permissions}</dd>

          </dl>

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

          <table class="annotated">

          {annotate%annotateline}

          </table>

      {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}: {file\|escape}@{node\|short} (annotated)</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 id="container">
				<div class="page-header">
				<h1><a href="{url}summary{sessionvars%urlparameter}">{repo\|escape}</a> / annotate</h1>

				<form action="{url}log">
				{sessionvars%hiddenformentry}
				<dl class="search">
				<dt><label>Search: </label></dt>
				<dd><input type="text" name="rev" /></dd>
				</dl>
				</form>

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

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

				<h2 class="no-link no-border">{file\|escape}@{node\|short} (annotated)</h2>
				<h3 class="changeset">{file\|escape}</h3>
				<p class="changeset-age age">{date\|rfc822date}</p>

				<dl class="overview">
				<dt>author</dt>
				<dd>{author\|obfuscate}</dd>
				<dt>date</dt>
				<dd>{date\|rfc822date}</dd>
				{branch%filerevbranch}
				<dt>changeset {rev}</dt>
				<dd><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></dd>
				{parent%fileannotateparent}
				{child%fileannotatechild}
				<dt>permissions</dt>
				<dd>{permissions\|permissions}</dd>
				</dl>

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

				<table class="annotated">
				{annotate%annotateline}
				</table>

				{footer}