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

share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...

share: wrap bmstore._writerepo for transaction sensitivity (issue4940) made 'bmstore.write()' transaction sensitive, to restore original bookmarks correctly at failure of a transaction. For example, shelve and unshelve imply steps below: before 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' writes updated ones into .hg/bookmarks 3. rollback transaction to remove internal commits 4. restore updated bookmarks manually after 46dec89fe888: 1. move active bookmark forward at internal rebasing 2. 'bmstore.write()' doesn't write updated ones into .hg/bookmarks (these are written into .hg/bookmarks.pending, if external hook is spawn) 3. rollback transaction to remove internal commits 4. .hg/bookmarks should be clean, because it isn't changed while transaction running: see (2) above But if shelve or unshelve is executed in the repository created with "shared bookmarks" ("hg share -B"), this doesn't work as expected, because: - share extension makes 'bmstore.write()' write updated bookmarks into .hg/bookmarks of shared source repository regardless of transaction activity, and - intentional transaction failure at the end of shelve/unshelve doesn't restore already updated .hg/bookmarks of shared source This patch makes share extension wrap 'bmstore._writerepo()' instead of 'bmstore.write()', because the former is used to actually write bookmark changes out.

av6 - - Load All Authors

File last commit:

r25794:90214844 default


                r26933:a7eecd02

stable

Download file

             filediff.tmpl
        
                    37 lines
            
             | 1.3 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / spartan / filediff.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: {file|escape} diff</title>

      </head>

      <body>

      <div class="buttons">

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

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

      <a href="{url|urlescape}graph/{symrev}{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}rev/{symrev}{sessionvars%urlparameter}">changeset</a>

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

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

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

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

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

      </div>

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

      <table id="filediffEntry">

      <tr>

       <th class="revision">revision {rev}:</th>

       <td class="revision"><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>

      </tr>

      {parent%filediffparent}

      {child%filediffchild}

      </table>

      <div id="fileDiff">

      {diff}

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

				{header}
				<title>{repo\|escape}: {file\|escape} diff</title>
				</head>
				<body>

				<div class="buttons">
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a>
				<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a>
				<a href="{url\|urlescape}graph/{symrev}{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}rev/{symrev}{sessionvars%urlparameter}">changeset</a>
				<a href="{url\|urlescape}file/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">file</a>
				<a href="{url\|urlescape}log/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a>
				<a href="{url\|urlescape}annotate/{symrev}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a>
				<a href="{url\|urlescape}raw-diff/{symrev}/{file\|urlescape}">raw</a>
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				</div>

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

				<table id="filediffEntry">
				<tr>
				<th class="revision">revision {rev}:</th>
				<td class="revision"><a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></td>
				</tr>
				{parent%filediffparent}
				{child%filediffchild}
				</table>

				<div id="fileDiff">
				{diff}
				</div>

				{footer}