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

merge: add a config to allow conflict-free merge of changes on adjacent lines...

merge: add a config to allow conflict-free merge of changes on adjacent lines This change adds a config to make it no longer a conflict to merge changes made on adjacent lines. The reason these changes are considered a conflict is that there's no region of text at the relevant position (sync region) that's kept unchanged by both sides of the merge. The problem can be solved by making the sync regions being a bit more powerful: we can keep a 0-length sync region if we find that a block unchanged by one side is ajacent to a block unchanged by the other side. Since these 0-length sync regions are emitted using the ~same algorithm as the normal non-empty sync regions, this change involves no arbitrary decisions and I expect it to work pretty well. 0-length sync regions do create an ambiguity in a special case where two pairs of adjacent regions "meet" at the same point. This corresponds to an insertion made at the same place by the two sides of the merge, and this still results in a conflict.

av6 - - Load All Authors

File last commit:

r35136:e397f858 default


                r52974:a021da4e

default

Download file

             fileannotate.tmpl
        
                    61 lines
            
             | 2.9 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / fileannotate.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

      <title>{repo|escape}: {file|escape}@{node|short} (annotated)</title>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
          <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}"/>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </head>

      <body>

      <div id="container">

          <div class="page-header">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
        Gregory Szorc
    
hgweb: consolidate search form for monoblue...

              r32759
            
              {searchform}

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
              <ul class="page-nav">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
                  <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>

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
                  <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>

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

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

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
              </ul>

          </div>

          <ul class="submenu">

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

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

        av6
    
monoblue: add a link to the latest file revision...

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

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

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

        av6
    
hgweb: don't dereference symbolic revision in monoblue style...

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

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

        Gregory Szorc
    
hgweb: link to raw-file on annotation page (BC)...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
          </ul>

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

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

        Anton Shestakov
    
hgweb: recreate old DOM structure for css in monoblue style...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
          <dl class="overview">

              <dt>author</dt>

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

              <dt>date</dt>

        av6
    
hgweb: show changeset age in more places (gitweb and monoblue)...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
              {branch%filerevbranch}

              <dt>changeset {rev}</dt>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
              {parent%fileannotateparent}

              {child%fileannotatechild}

              <dt>permissions</dt>

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

          </dl>

        Angel Ezquerra
    
hgweb: apply the websub filter to revision descriptions...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
          <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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: {file\|escape}@{node\|short} (annotated)</title>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>

		<body>
		<div id="container">
		<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / annotate</h1>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Gregory Szorc hgweb: consolidate search form for monoblue...	r32759	{searchform}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<ul class="page-nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}file/{symrev}{path\|urlescape}{sessionvars%urlparameter}">files</a></li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>
		</div>

		<ul class="submenu">
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
av6 monoblue: add a link to the latest file revision...	r26598	<li><a href="{url\|urlescape}file/tip/{file\|urlescape}{sessionvars%urlparameter}">latest</a></li>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li class="current">annotate</li>
av6 hgweb: don't dereference symbolic revision in monoblue style...	r25604	<li><a href="{url\|urlescape}diff/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">diff</a></li>
		<li><a href="{url\|urlescape}comparison/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">comparison</a></li>
Gregory Szorc hgweb: link to raw-file on annotation page (BC)...	r30708	<li><a href="{url\|urlescape}raw-file/{symrev}/{file\|urlescape}">raw</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>

		<h2 class="no-link no-border">{file\|escape}@{node\|short} (annotated)</h2>
		<h3 class="changeset">{file\|escape}</h3>
Anton Shestakov hgweb: recreate old DOM structure for css in monoblue style...	r24109	<p class="changeset-age"><span class="age">{date\|rfc822date}</span></p>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<dl class="overview">
		<dt>author</dt>
		<dd>{author\|obfuscate}</dd>
		<dt>date</dt>
av6 hgweb: show changeset age in more places (gitweb and monoblue)...	r35136	<dd class="date age">{date\|rfc822date}</dd>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{branch%filerevbranch}
		<dt>changeset {rev}</dt>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<dd><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></dd>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{parent%fileannotateparent}
		{child%fileannotatechild}
		<dt>permissions</dt>
		<dd>{permissions\|permissions}</dd>
		</dl>

Angel Ezquerra hgweb: apply the websub filter to revision descriptions...	r18628	<p class="description">{desc\|strip\|escape\|websub\|addbreaks\|nonempty}</p>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		<table class="annotated">
		{annotate%annotateline}
		</table>

		{footer}