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

rebase: allow rebasing children of wd to wd if a new branch has been set (BC)...

rebase: allow rebasing children of wd to wd if a new branch has been set (BC) The named branch of the leaf changeset can be changed by updating to it, setting the branch, and amending. But previously, there was no good way to *just* change the branch of several linear changes. If rebasing changes with another parent to '.', it would pick up a pending branch change up. But when rebasing changes that have the same parent, it would fail with 'nothing to rebase', even when the branch name was set differently. To fix this, allow rebasing to same parent when a branch has been set.

Gregory Szorc - - Load All Authors

File last commit:

r30766:d7bf7d2b default


                r31380:65d93d71

default

Download file

             shortlog.tmpl
        
                    58 lines
            
             | 2.0 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / shortlog.tmpl
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      {header}

      <title>{repo|escape}: Shortlog</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="page_header">

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

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

      </div>

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

      {sessionvars%hiddenformentry}

      <div class="search">

      <input type="text" name="rev"  />

      </div>

      </form>

      <div class="page_nav">

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

      shortlog |

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

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

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

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

      <br/>{changenav%navshort}<br/>

      </div>

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

      <table class="shortlogtable" cellspacing="0">

      {entries%shortlogentry}

      </table>

      <div class="page_nav">

      {changenav%navshort}

      </div>

      <script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>

          ajaxScrollInit(

                  '{url|urlescape}shortlog/%next%{sessionvars%urlparameter}',

                  '{nextentry%"{node}"}', <!-- NEXTHASH

                  function (htmlText, previousVal) \{

                      var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);

                      return m ? m[1] : null;

                  },

                  '.shortlogtable > tbody:nth-of-type(1)',

                  '<tr class="%class%">\

                  <td colspan="4" style="text-align: center;">%text%</td>\

                  </tr>'

          );

      </script>

      {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}: Shortlog</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="page_header">
				<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
				<a href="/">Mercurial</a> {pathdef%breadcrumb} / shortlog
				</div>

				<form action="{url\|urlescape}log">
				{sessionvars%hiddenformentry}
				<div class="search">
				<input type="text" name="rev" />
				</div>
				</form>
				<div class="page_nav">
				<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
				shortlog \|
				<a href="{url\|urlescape}log/{symrev}{sessionvars%urlparameter}">changelog</a> \|
				<a href="{url\|urlescape}graph/{symrev}{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> \|
				<a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>{archives%archiveentry} \|
				<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
				<br/>{changenav%navshort}<br/>
				</div>

				<div class="title"> </div>
				<table class="shortlogtable" cellspacing="0">
				{entries%shortlogentry}
				</table>

				<div class="page_nav">
				{changenav%navshort}
				</div>

				<script type="text/javascript"{if(nonce, ' nonce="{nonce}"')}>
				ajaxScrollInit(
				'{url\|urlescape}shortlog/%next%{sessionvars%urlparameter}',
				'{nextentry%"{node}"}', <!-- NEXTHASH
				function (htmlText, previousVal) \{
				var m = htmlText.match(/'(\w+)', <!-- NEXTHASH/);
				return m ? m[1] : null;
				},
				'.shortlogtable > tbody:nth-of-type(1)',
				'<tr class="%class%">\
				<td colspan="4" style="text-align: center;">%text%</td>\
				</tr>'
				);
				</script>

				{footer}