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

admin-commands: move the chainsaw extension to the admin commands module...

admin-commands: move the chainsaw extension to the admin commands module Activating an extension is always a little bit of a chore and the long name, options and "chainsaw" bits are deterrent enough. This also allows us to help the discoverability for people looking for repo "administration" tools, with the widest semantic of "administration".

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r52396:d4095f7b

stable

Download file

             mergeutil.py
        
                    18 lines
            
             | 463 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

      #

        Raphaël Gomès
    
contributor: change mentions of mpm to olivia...

              r47575
            
      # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>

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

              r30494
            
      #

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

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

      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):

        Augie Fackler
    
cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))...

              r47070
            
          if ms.unresolvedcount():

        Martin von Zweigbergk
    
errors: raise StateError when there are unresolves merge conflicts...

              r46528
            
              raise error.StateError(

        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
            
              )

	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
		#
Raphaël Gomès contributor: change mentions of mpm to olivia...	r47575	# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
Augie Fackler checkunresolved: move to new package to help avoid import cycles...	r30494	#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.


		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):
Augie Fackler cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))...	r47070	if ms.unresolvedcount():
Martin von Zweigbergk errors: raise StateError when there are unresolves merge conflicts...	r46528	raise error.StateError(
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	)