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

rebase: move bookmarks with --keep (issue5682)...

rebase: move bookmarks with --keep (issue5682) This is a regression caused by 3b7cb3d17137. We have documented the behavior in rebase help: Rebase will destroy original commits unless you use "--keep". It will also move your bookmarks (even if you do). So let's restore the old behavior. It is done by changing `scmutil.cleanupnodes` to accept more information so a node could have different "movement destination" from "successors". It also helps simplifying the callsite as a side effect - the special bookmark movement logic in rebase is removed. Differential Revision: https://phab.mercurial-scm.org/D727

Anton Shestakov - - Load All Authors

File last commit:

r25108:09ec4220 default


                r34364:2f427b57

4.3.3 stable

Download file

             shortlogentry.tmpl
        
                    8 lines
            
             | 352 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / shortlogentry.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

       <tr>

        <td class="age">{date|rfc822date}</td>

        <td class="author">{author|person}</td>

        <td class="description">

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

         {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}

        </td>

       </tr>

	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

				<tr>
				<td class="age">{date\|rfc822date}</td>
				<td class="author">{author\|person}</td>
				<td class="description">
				<a href="{url\|urlescape}rev/{node\|short}{sessionvars%urlparameter}">{desc\|strip\|firstline\|escape\|nonempty}</a>
				{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}
				</td>
				</tr>