upstream/mercurial-mirror Files · hgext/fastannotate/error.py

merge: rework iteration over mergeresult object in checkpathconflicts()...

merge: rework iteration over mergeresult object in checkpathconflicts() Instead of following pattern: ``` for f, (m, args, msg) in mresult.actions.items(): if m == mergestatemod.ACTION_*: ... elif m == mergestatemod.ACTION_*: ... .... ``` We do: ``` for (f, args, msg) in mresult.getaction((mergestatemod.ACTION_*,)): ... for (f, args, msg) in mresult.getaction((mergestatemod.ACTION_*,)): ... .... ``` This makes code bit easier to understand and prevent iterating over actions which we don't need. Differential Revision: https://phab.mercurial-scm.org/D8884

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r45902:150900a1

default

Download file

             error.py
        
                    15 lines
            
             | 413 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / fastannotate / error.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
fastannotate: initial import from Facebook's hg-experimental...

              r39243
            
      # Copyright 2016-present Facebook. All Rights Reserved.

      #

      # error: errors used in fastannotate

      #

      # 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

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Augie Fackler
    
fastannotate: initial import from Facebook's hg-experimental...

              r39243
            
      class CorruptedFileError(Exception):

          pass

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Augie Fackler
    
fastannotate: initial import from Facebook's hg-experimental...

              r39243
            
      class CannotReuseError(Exception):

          """cannot reuse or update the cache incrementally"""

	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 fastannotate: initial import from Facebook's hg-experimental...	r39243	# Copyright 2016-present Facebook. All Rights Reserved.
		#
		# error: errors used in fastannotate
		#
		# 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

Augie Fackler formatting: blacken the codebase...	r43346
Augie Fackler fastannotate: initial import from Facebook's hg-experimental...	r39243	class CorruptedFileError(Exception):
		pass

Augie Fackler formatting: blacken the codebase...	r43346
Augie Fackler fastannotate: initial import from Facebook's hg-experimental...	r39243	class CannotReuseError(Exception):
		"""cannot reuse or update the cache incrementally"""