upstream/mercurial-mirror Files · mercurial/templates/spartan/changelog.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

             changelog.tmpl
        
                    44 lines
            
             | 1.5 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / changelog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: changelog</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 class="buttons">

      <a href="{url|urlescape}shortlog/{rev}{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>

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

      {archives%archiveentry}

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

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

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

      </div>

      <h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changelog</h2>

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

      {sessionvars%hiddenformentry}

      <p>

      <label for="search1">search:</label>

      <input name="rev" id="search1" type="text" size="30">

      navigate: <small class="navigate">{changenav%nav}</small>

      </p>

      </form>

      {entries%changelogentry}

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

      {sessionvars%hiddenformentry}

      <p>

      <label for="search2">search:</label>

      <input name="rev" id="search2" type="text" size="30">

      navigate: <small class="navigate">{changenav%nav}</small>

      </p>

      </form>

      {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}: changelog</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 class="buttons">
				<a href="{url\|urlescape}shortlog/{rev}{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>
				<a href="{url\|urlescape}file/{node\|short}{sessionvars%urlparameter}">files</a>
				{archives%archiveentry}
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				<a type="application/rss+xml" href="{url\|urlescape}rss-log">rss</a>
				<a type="application/atom+xml" href="{url\|urlescape}atom-log" title="Atom feed for {repo\|escape}">atom</a>
				</div>

				<h2><a href="/">Mercurial</a> {pathdef%breadcrumb} / changelog</h2>

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p>
				<label for="search1">search:</label>
				<input name="rev" id="search1" type="text" size="30">
				navigate: <small class="navigate">{changenav%nav}</small>
				</p>
				</form>

				{entries%changelogentry}

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<p>
				<label for="search2">search:</label>
				<input name="rev" id="search2" type="text" size="30">
				navigate: <small class="navigate">{changenav%nav}</small>
				</p>
				</form>

				{footer}