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

filemerge: call premerge directly from main merge function...

filemerge: call premerge directly from main merge function The merge code currently does (in pseudocode): for f in tomerge: premerge f merge f We'd like to change this to look more like: for f in tomerge: premerge f for f in tomerge: merge f This makes sure as many files are resolved as possible before prompting for the others. This restructuring is also necessary for custom merge drivers. This function separates out the premerge step from the merge step. In future patches we'll actually turn these into separate steps in the merge driver. The 'if r:' occurrences will be cleaned up in subsequent patches.

av6 - - Load All Authors

File last commit:

r25603:1cac419a default


                r26567:f18646cf

default

Download file

             filelog.tmpl
        
                    29 lines
            
             | 1.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / filelog.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} history</title>

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

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

              r18526
            
         href="{url|urlescape}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}">

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

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

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

              r18526
            
         href="{url|urlescape}rss-log/tip/{file|urlescape}" title="RSS feed for {repo|escape}:{file}">

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

              r9999
            
      </head>

      <body>

      <div class="buttons">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

              r9999
            
      </div>

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb, spartan: add "URL breadcrumbs"...

              r18259
            
      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / {file|escape} revision history</h2>

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

              r9999
            
        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      <p>navigate: <small class="navigate">{nav%filenav}</small></p>

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

              r9999
            
      {entries%filelogentry}

      {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} history</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-log/tip/{file\|urlescape}" title="Atom feed for {repo\|escape}:{file}">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-log/tip/{file\|urlescape}" title="RSS feed for {repo\|escape}:{file}">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</head>
		<body>

		<div class="buttons">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a>
		<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a>
		<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a>
		<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a>
		<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a>
av6 hgweb: don't dereference symbolic revision in spartan style...	r25603	<a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a>
		<a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
		<a type="application/rss+xml" href="{url\|urlescape}rss-log/tip/{file\|urlescape}">rss</a>
		<a type="application/atom+xml" href="{url\|urlescape}atom-log/tip/{file\|urlescape}" title="Atom feed for {repo\|escape}:{file}">atom</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

Angel Ezquerra <angel.ezquerra at gmail.com> hgweb, spartan: add "URL breadcrumbs"...	r18259	<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / {file\|escape} revision history</h2>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	<p>navigate: <small class="navigate">{nav%filenav}</small></p>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		{entries%filelogentry}

		{footer}