upstream/mercurial-mirror Files · mercurial/templates/gitweb/help.tmpl

bookmarks: use recordchange instead of writing if transaction is active...

bookmarks: use recordchange instead of writing if transaction is active Before this patch, 'bmstore.write()' always write in-memory bookmark changes into '.hg/bookmarks' regardless of transaction activity. If 'bmstore.write()' is invoked inside a transaction and it writes changes into '.hg/bookmarks', then: - original bookmarks aren't restored at failure of that transaction This breaks "all or nothing" policy of the transaction. BTW, "hg rollback" can restore bookmarks successfully even before this patch, because original bookmarks are saved into '.hg/journal.bookmarks' at the beginning of the transaction, and it (actually renamed as '.hg/undo.bookmarks') is used by "hg rollback". - uncommitted bookmark changes are visible to other processes This is a kind of "dirty read" For example, 'rebase.rebase()' implies 'bmstore.write()', and it may be executed inside the transaction of "hg unshelve". Then, intentional aborting at the end of "hg unshelve" transaction doesn't restore original bookmarks (this is obviously a bug). This patch uses 'bmstore.recordchange()' instead of actual writing by 'bmstore._writerepo()', if any transaction is active This patch also removes meaningless restoring bmstore explicitly at the end of "hg shelve". This patch doesn't choose fixing each 'bmstore.write()' callers as like below, because writing similar code here and there is very redundant. before: bmstore.write() after: tr = repo.currenttransaction() if tr: bmstore.recordchange(tr) else: bmstore.write() Even though 'bmstore.write()' itself may have to be discarded by putting bookmark operations into transaction scope, this patch chose fixing it to implement "transactional dirstate" at first.

av6 - - Load All Authors

File last commit:

r25686:def530e7 default


                r26520:46dec89f

default

Download file

             help.tmpl
        
                    34 lines
            
             | 1.1 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / help.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      {header}

        av6
    
hgweb: fix help pages title in gitweb and monoblue...

              r25686
            
      <title>Help: {topic}</title>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <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-tags" title="Atom feed for {repo|escape}"/>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <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-tags" title="RSS feed for {repo|escape}"/>

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      </head>

      <body>

      <div class="page_header">

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

              r18258
            
      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>

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

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      </div>

      <div class="page_nav">

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

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

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

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

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

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

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

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

        av6
    
hgweb: don't point file links at tip hash where it doesn't make sense...

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

        Yuya Nishihara
    
hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help

              r13861
            
      help

        Augie Fackler
    
web: add a help view for getting hg help output

              r12666
            
      <br/>

      </div>

      <div class="title">&nbsp;</div>

        Dan Villiom Podlaski Christiansen
    
hgweb: generate HTML documentation...

              r18747
            
      <div id="doc">

      {rstdoc(doc, "html")}

      </div>

        Augie Fackler
    
web: add a help view for getting hg help output

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

Augie Fackler web: add a help view for getting hg help output	r12666	{header}
av6 hgweb: fix help pages title in gitweb and monoblue...	r25686	<title>Help: {topic}</title>
Augie Fackler web: add a help view for getting hg help output	r12666	<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-tags" title="Atom feed for {repo\|escape}"/>
Augie Fackler web: add a help view for getting hg help output	r12666	<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-tags" title="RSS feed for {repo\|escape}"/>
Augie Fackler web: add a help view for getting hg help output	r12666	</head>
		<body>

		<div class="page_header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
		<a href="/">Mercurial</a> {pathdef%breadcrumb} / help
Augie Fackler web: add a help view for getting hg help output	r12666	</div>

		<div class="page_nav">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
		<a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">shortlog</a> \|
		<a href="{url\|urlescape}log{sessionvars%urlparameter}">changelog</a> \|
		<a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a> \|
		<a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a> \|
		<a href="{url\|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> \|
		<a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a> \|
av6 hgweb: don't point file links at tip hash where it doesn't make sense...	r25526	<a href="{url\|urlescape}file{sessionvars%urlparameter}">files</a> \|
Yuya Nishihara hgweb: fix typo and inactive link in page_nav and page_header of gitweb's help	r13861	help
Augie Fackler web: add a help view for getting hg help output	r12666	<br/>
		</div>

		<div class="title"> </div>

Dan Villiom Podlaski Christiansen hgweb: generate HTML documentation...	r18747	<div id="doc">
		{rstdoc(doc, "html")}
		</div>
Augie Fackler web: add a help view for getting hg help output	r12666
		{footer}