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

revert: properly back up added files with local modification...

revert: properly back up added files with local modification These files were previously not backed up because the backup mechanism was not smart enough. This leads to data lose for the user since uncommitted contents were discarded. We now properly move the modified version to <filename>.orig before deleting it. We have to use a small hack to do a different action if "--no-backup" is specified. This is needed because the backup process is actually a move (not a copy) so the file is already missing when we backup. The internet kitten is a bit disapointed about that, but such is life. This patch concludes the "lets refactor revert" phases. We can now open the "Lets find stupid bug with renames and merge" phases. I'm sure that now that the code is clearer we could do it in another simpler way, but I consider the current improvement good enough for now.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r22611:2ff28e07

default

Download file

             filelog.tmpl
        
                    52 lines
            
             | 2.4 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / 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 revisions</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} / file revisions</h1>

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

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

              r18526
            
              <form action="{url|urlescape}log">

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

              r9999
            
                  {sessionvars%hiddenformentry}

                  <dl class="search">

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

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

                  </dl>

              </form>

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

                  <li><a href="{url|urlescape}graph/{node|short}{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/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>

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

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

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

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

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

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

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

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

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

              <li><a href="{url|urlescape}rss-log/tip/{file|urlescape}">rss</a></li>

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

              r9999
            
          </ul>

          <h2 class="no-link no-border">{file|urlescape}</h2>

          <table>

          {entries%filelogentry}

          </table>

          <div class="page-path">

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

              r10254
            
          {nav%filenav}

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

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: File revisions</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} / file revisions</h1>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form action="{url\|urlescape}log">
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{sessionvars%hiddenformentry}
		<dl class="search">
		<dt><label>Search: </label></dt>
		<dd><input type="text" name="rev" /></dd>
		</dl>
		</form>

		<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>
		<li><a href="{url\|urlescape}graph/{node\|short}{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/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">files</a></li>
		<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">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<li class="current">revisions</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
		<li><a href="{url\|urlescape}diff/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">diff</a></li>
		<li><a href="{url\|urlescape}comparison/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">comparison</a></li>
		<li><a href="{url\|urlescape}rss-log/tip/{file\|urlescape}">rss</a></li>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</ul>

		<h2 class="no-link no-border">{file\|urlescape}</h2>

		<table>
		{entries%filelogentry}
		</table>

		<div class="page-path">
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	{nav%filenav}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		{footer}