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

status: disable morestatus when using -0...

status: disable morestatus when using -0 Without this patch, you get something like this: ``` M a\x00? a.orig\x00# The repository is in an unfinished *merge* state. (esc) # Unresolved merge conflicts: # # a # # To mark files as resolved: hg resolve --mark FILE # To continue: hg commit # To abort: hg merge --abort ``` That doesn't seem like something one would ever want. I considered making it an error to combine `-0` with morestatus, but it seems very likely that that would just make the user spend time trying to figure out how to disable morestatus, so it feels like we might as well just do it for them. Differential Revision: https://phab.mercurial-scm.org/D9545

Gregory Szorc - - Load All Authors

File last commit:

r43376:d783f945 default


                r46696:7a2b67e6

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