upstream/mercurial-mirror Files · mercurial/templates/gitweb/notfound.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

Thomas Arendsen Hein - - Load All Authors

File last commit:

r18526:9409aeaa stable


                r44821:9c9cfecd

default

Download file

             notfound.tmpl
        
                    18 lines
            
             | 397 B
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / gitweb / notfound.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r9999
            
      {header}

      <title>Mercurial repository not found</title>

      </head>

      <body>

      <div class="page_header">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}

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

              r9999
            
      </div>

      <div class="page_body">

      The specified repository "{repo|escape}" is unknown, sorry.

      <br/>

      <br/>

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

              r18526
            
      Please go back to the <a href="{url|urlescape}">main repository list page</a>.

        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>Mercurial repository not found</title>
		</head>

		<body>

		<div class="page_header">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo\|escape}
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		<div class="page_body">
		The specified repository "{repo\|escape}" is unknown, sorry.
		<br/>
		<br/>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	Please go back to the <a href="{url\|urlescape}">main repository list page</a>.
Dan Villiom Podlaski Christiansen setup: install translation files as package data...	r9999	</div>

		{footer}