upstream/mercurial-mirror Files · mercurial/templates/paper/graphentry.tmpl

merge: don't auto-pick destination with `hg merge 'wdir()'`...

merge: don't auto-pick destination with `hg merge 'wdir()'` If the user doesn't specify a commit to merge with, we'll have `node==None` in `commands.merge()`. We'll then try to find a good commit to merge with. However, if the user, for some strange reason, runs `hg merge 'wdir()'`, we'll also have `node==None` and we'll do that same. That's clearly not the intent, so let's not do that. It turns out we'd instead crash on that command after this patch, so I added special handling of it too. Differential Revision: https://phab.mercurial-scm.org/D7996

av6 - - Load All Authors

File last commit:

r35547:5afe0ca5 default


                r44638:1850066f

default

Download file

             graphentry.tmpl
        
                    9 lines
            
             | 309 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / graphentry.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        av6
    
paper: render changesets server-side on /graph page

              r35219
            
      <li data-node="{node|short}">

        av6
    
paper: make actual changeset entries have backgrounds on /graph...

              r35547
            
       <div class="fg">

        <span class="desc">

         <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>

        </span>

        {alltags}

        <div class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</div>

       </div>

        av6
    
paper: render changesets server-side on /graph page

              r35219
            
      </li>

	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

av6 paper: render changesets server-side on /graph page	r35219	<li data-node="{node\|short}">
av6 paper: make actual changeset entries have backgrounds on /graph...	r35547	<div class="fg">
		<span class="desc">
		<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{desc\|strip\|firstline\|escape\|nonempty}</a>
		</span>
		{alltags}
		<div class="info"><span class="age">{date\|rfc822date}</span>, by {author\|person}</div>
		</div>
av6 paper: render changesets server-side on /graph page	r35219	</li>