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

progress: flush stderr after clearing...

progress: flush stderr after clearing On python3, ui.stderr is buffered, it seems, so we need to flush it to actually get the progress bar off the screen. This is important since ui.write() will call into progbar.clear() if it thinks there's a progress bar on the screen, with the intent that the next thing it outputs is at the beginning of the line (instead of at the end of the progress bar line). Without the flush, we buffer up the clearing of the screen, and we get some really weird/corrupt output. Differential Revision: https://phab.mercurial-scm.org/D7784

Martin von Zweigbergk - - Load All Authors

File last commit:

r43387:8ff1ecfa default


                r44485:4e0a6d15

stable

Download file

             mergeutil.py
        
                    24 lines
            
             | 697 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / mergeutil.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
checkunresolved: move to new package to help avoid import cycles...

              r30494
            
      # mergeutil.py - help for merge processing in mercurial

      #

      # Copyright 2005-2007 Matt Mackall <mpm@selenic.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

      from .i18n import _

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
      from . import error

        Augie Fackler
    
checkunresolved: move to new package to help avoid import cycles...

              r30494
            
      def checkunresolved(ms):

          if list(ms.unresolved()):

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
              raise error.Abort(

        Martin von Zweigbergk
    
cleanup: join string literals that are already on one line...

              r43387
            
                  _(b"unresolved merge conflicts (see 'hg help resolve')")

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
              )

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
          if ms.mdstate() != b's' or list(ms.driverresolved()):

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
              raise error.Abort(

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
                  _(b'driver-resolved merge conflicts'),

                  hint=_(b'run "hg resolve --all" to resolve'),

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
              )

	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

Augie Fackler checkunresolved: move to new package to help avoid import cycles...	r30494	# mergeutil.py - help for merge processing in mercurial
		#
		# Copyright 2005-2007 Matt Mackall <mpm@selenic.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

		from .i18n import _

Augie Fackler formatting: blacken the codebase...	r43346	from . import error

Augie Fackler checkunresolved: move to new package to help avoid import cycles...	r30494
		def checkunresolved(ms):
		if list(ms.unresolved()):
Augie Fackler formatting: blacken the codebase...	r43346	raise error.Abort(
Martin von Zweigbergk cleanup: join string literals that are already on one line...	r43387	_(b"unresolved merge conflicts (see 'hg help resolve')")
Augie Fackler formatting: blacken the codebase...	r43346	)
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	if ms.mdstate() != b's' or list(ms.driverresolved()):
Augie Fackler formatting: blacken the codebase...	r43346	raise error.Abort(
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	_(b'driver-resolved merge conflicts'),
		hint=_(b'run "hg resolve --all" to resolve'),
Augie Fackler formatting: blacken the codebase...	r43346	)