upstream/mercurial-mirror Files · contrib/macosx/Welcome.html

rebase: allow aborting if last-message.txt is missing...

rebase: allow aborting if last-message.txt is missing Previously, if .hg/rebasestate existed but .hg/last-message.txt was missing, 'hg rebase --abort' would say there's no rebase in progress but 'hg checkout foo' would say 'abort: rebase in progress'. It turns out loading the collapse message will throw a "no rebase in progress" error if the file doesn't exist, even though .hg/rebasestate obviously indicates a rebase is in progress. The fix is to only throw an exception if we're trying to --continue, and to just eat the issues if we're doing --abort. This issue is exposed by us writing the rebase state earlier in the process. This will be used by later patches to ensure the user can appropriately 'hg rebase --abort' if there's a crash before the first the first commit has finished rebasing. Tests cover all of this. The only negative affect is we now require a hg rebase --abort in a very specific exception case, as shown in the test.

Augie Fackler - - Load All Authors

File last commit:

r29534:7794e13c default


                r31225:749b057b

default

Download file

             Welcome.html
        
                    20 lines
            
             | 794 B
            
                | text/html
            
             |
                HtmlLexer
            
             / contrib / macosx / Welcome.html
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Vadim Gelfer
    
make stuff for macos x binary package....

              r1686
            
      <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">

        Augie Fackler
    
osx: correct comment about ordering of welcome page

              r29534
            
      <!-- This is the first screen displayed during the install. -->

        Vadim Gelfer
    
make stuff for macos x binary package....

              r1686
            
      <html>

      <head>

        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

        <meta http-equiv="Content-Style-Type" content="text/css">

        <title></title>

        <style type="text/css">

        Lee Cantey
    
Update Windows and Mac installers to 0.9.1 release

              r2681
            
          p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}

        Vadim Gelfer
    
make stuff for macos x binary package....

              r1686
            
          p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}

        </style>

      </head>

      <body>

        Matt Mackall
    
urls: bulk-change primary website URLs

              r26421
            
      <p class="p1">This is a prepackaged release of <a href="https://mercurial-scm.org/">Mercurial</a> for Mac OS X.</p>

        Vadim Gelfer
    
make stuff for macos x binary package....

              r1686
            
      <p class="p2"><br></p>

        Lee Cantey
    
Update Windows and Mac installers to 0.9.1 release

              r2681
            
      <br>

        Matt Mackall
    
Remove hard-coded version numbers and release notes from packaging

              r3863
            
      <p>

        Matt Mackall
    
urls: bulk-change primary website URLs

              r26421
            
      Please be sure to read the latest <a href="https://mercurial-scm.org/wiki/WhatsNew">release notes</a>.</p>

        Vadim Gelfer
    
make stuff for macos x binary package....

              r1686
            
      </body>

      </html>

	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

Vadim Gelfer make stuff for macos x binary package....	r1686	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
Augie Fackler osx: correct comment about ordering of welcome page	r29534	<!-- This is the first screen displayed during the install. -->
Vadim Gelfer make stuff for macos x binary package....	r1686	<html>
		<head>
		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
		<meta http-equiv="Content-Style-Type" content="text/css">
		<title></title>
		<style type="text/css">
Lee Cantey Update Windows and Mac installers to 0.9.1 release	r2681	p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 14.0px Helvetica}
Vadim Gelfer make stuff for macos x binary package....	r1686	p.p2 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Helvetica; min-height: 14.0px}
		</style>
		</head>
		<body>
Matt Mackall urls: bulk-change primary website URLs	r26421	<p class="p1">This is a prepackaged release of <a href="https://mercurial-scm.org/">Mercurial</a> for Mac OS X.</p>
Vadim Gelfer make stuff for macos x binary package....	r1686	<p class="p2"><br></p>
Lee Cantey Update Windows and Mac installers to 0.9.1 release	r2681	<br>
Matt Mackall Remove hard-coded version numbers and release notes from packaging	r3863	<p>
Matt Mackall urls: bulk-change primary website URLs	r26421	Please be sure to read the latest <a href="https://mercurial-scm.org/wiki/WhatsNew">release notes</a>.</p>
Vadim Gelfer make stuff for macos x binary package....	r1686	</body>
		</html>