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

rebase: don't use rebased node as dirstate p2 (BC)...

rebase: don't use rebased node as dirstate p2 (BC) When rebasing a node, we currently use the rebased node as p2 in the dirstate until just before we commit it (we then change to the desired parents). This p2 is visible to the user when the rebase gets interrupted because of merge conflicts. That can be useful to the user as a reminder of which commit is currently being rebased, but I believe it's incorrect for a few reasons: * I think the dirstate parents should be the ones that will be set when the commit is created. * I think having two parents means that you're merging those two commits, but when rebasing, you're generally grafting, not merging. * When rebasing a merge commit, we should use the two desired parents as dirstate parents (and we clearly can't have the rebased node as a third dirstate parent). * `hg graft` (and `hg update --merge`) sets only one parent and `hg rebase` should be consistent with that. I realize that this is a somewhat large user-visible change, but I think it's worth it because it will simplify things quite a bit. Differential Revision: https://phab.mercurial-scm.org/D7827

Gregory Szorc - - Load All Authors

File last commit:

r32990:816a4fa7 default


                r44821:9c9cfecd

default

Download file

             changelog.tmpl
        
                    38 lines
            
             | 1.2 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / changelog.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {header}

      <title>{repo|escape}: Changelog</title>

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </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} / changelog

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

      <div class="page_nav">

        Gregory Szorc
    
hgweb: refresh styling of gitweb's search form...

              r32762
            
      <div>

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

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

        av6
    
hgweb: don't dereference symbolic revision in gitweb style...

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      changelog |

        av6
    
gitweb: don't drop current revision context on graph page...

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

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

              r18526
            
      <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 dereference symbolic revision in gitweb style...

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

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

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

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      <br/>

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      {changenav%nav}<br/>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      </div>

        Gregory Szorc
    
hgweb: refresh styling of gitweb's search form...

              r32762
            
      {searchform}

      </div>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

              r9999
            
      {entries%changelogentry}

        Gregory Szorc
    
hgweb: use separate CSS class for navigation links in footer...

              r32990
            
      <div class="extra_nav">

        Nicolas Dumazet
    
hgweb: changenav: separate pages before and after the current position...

              r10254
            
      {changenav%nav}<br/>

        Dan Villiom Podlaski Christiansen
    
setup: install translation files as package data...

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

Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	{header}
		<title>{repo\|escape}: Changelog</title>
		<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-log" title="Atom feed for {repo\|escape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<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-log" title="RSS feed for {repo\|escape}"/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</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} / changelog
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="page_nav">
Gregory Szorc hgweb: refresh styling of gitweb's search form...	r32762	<div>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}summary{sessionvars%urlparameter}">summary</a> \|
av6 hgweb: don't dereference symbolic revision in gitweb style...	r25605	<a href="{url\|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">shortlog</a> \|
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	changelog \|
av6 gitweb: don't drop current revision context on graph page...	r26666	<a href="{url\|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a> \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<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 dereference symbolic revision in gitweb style...	r25605	<a href="{url\|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>{archives%archiveentry} \|
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	<br/>
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	{changenav%nav}<br/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>
Gregory Szorc hgweb: refresh styling of gitweb's search form...	r32762	{searchform}
		</div>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999
		{entries%changelogentry}

Gregory Szorc hgweb: use separate CSS class for navigation links in footer...	r32990	<div class="extra_nav">
Nicolas Dumazet hgweb: changenav: separate pages before and after the current position...	r10254	{changenav%nav}<br/>
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		{footer}