upstream/mercurial-mirror Files · mercurial/__init__.py

rebase: stop relying on having two parents to resume rebase...

rebase: stop relying on having two parents to resume rebase I'm about to make it so we don't have two parents when a rebase is interrupted (unless we're just rebasing on a merge commit). The code for detecting if we're resuming a rebase relied on having two parents, so this patch rewrites that to instead set a boolean when we resume. Note that `self.resume` in the new condition implies `not self.inmemory` (rebase cannot be resumed in memory), so that's why that part can be omitted. Differential Revision: https://phab.mercurial-scm.org/D7826

Gregory Szorc - - Load All Authors

File last commit:

r43376:d783f945 default


                r44820:b42ce825

default

Download file

             __init__.py
        
                    13 lines
            
             | 416 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Gregory Szorc
    
mercurial: implement import hook for handling C/Python modules...

              r27220
            
      # __init__.py - Startup and module loading logic for Mercurial.

      #

      # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

        Siddharth Agarwal
    
demandimport: move to separate package...

              r32420
            
      # Allow 'from mercurial import demandimport' to keep working.

      import hgdemandimport

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Siddharth Agarwal
    
demandimport: move to separate package...

              r32420
            
      demandimport = hgdemandimport

	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

Gregory Szorc mercurial: implement import hook for handling C/Python modules...	r27220	# __init__.py - Startup and module loading logic for Mercurial.
		#
		# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
		#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.

		from __future__ import absolute_import

Siddharth Agarwal demandimport: move to separate package...	r32420	# Allow 'from mercurial import demandimport' to keep working.
		import hgdemandimport
Augie Fackler formatting: blacken the codebase...	r43346
Siddharth Agarwal demandimport: move to separate package...	r32420	demandimport = hgdemandimport