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

merge: pass mergeresult obj in _forgetremoved() (API)...

merge: pass mergeresult obj in _forgetremoved() (API) Instead of returning a dict of actions and then updating it, let's pass the object directly and update it there. This makes `updateactions()` on mergeresult unused and this patch removes that. After this patch, we have couple of methods left on mergeresult class which still exposes the internal dict based action storage. Differential Revision: https://phab.mercurial-scm.org/D8889

Augie Fackler - - Load All Authors

File last commit:

r43346:2372284d default


                r45907:1aef38d9

default

Download file

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

      # 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

      class CorruptedFileError(Exception):

          pass

      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

				# 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


				class CorruptedFileError(Exception):
				pass


				class CannotReuseError(Exception):
				"""cannot reuse or update the cache incrementally"""