upstream/mercurial-mirror Files · hgext/remotefilelog/shallowverifier.py

commit: reorder if-else conditional to give mergestate info priority...

commit: reorder if-else conditional to give mergestate info priority Looking at the code now, I was unable to find a good reason as why we only rely on mergestate extras info after checking whether a filelog parent is ancestor of other or not. I mean if we have stored in mergestate that `other` was chosed, we should blindly pick that one. This cleanup will also help introduce more cases when both `fparent1` and `fparent2` are non-null but using info from mergestate, we can fastpath. The test change actually demonstrates the point of the patch. During merge we were getting the other side of the file but on commit we were marking that as merged. Differential Revision: https://phab.mercurial-scm.org/D10147

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r47437:d6fa9fbd

stable

Download file

             shallowverifier.py
        
                    19 lines
            
             | 625 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / remotefilelog / shallowverifier.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
remotefilelog: import pruned-down remotefilelog extension from hg-experimental...

              r40530
            
      # shallowverifier.py - shallow repository verifier

      #

      # Copyright 2015 Facebook, Inc.

      #

      # 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 mercurial.i18n import _

      from mercurial import verify

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Augie Fackler
    
remotefilelog: import pruned-down remotefilelog extension from hg-experimental...

              r40530
            
      class shallowverifier(verify.verifier):

          def _verifyfiles(self, filenodes, filelinkrevs):

              """Skips files verification since repo's not guaranteed to have them"""

              self.repo.ui.status(

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

              r43347
            
                  _(b"skipping filelog check since remotefilelog is used\n")

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
              )

        Augie Fackler
    
remotefilelog: import pruned-down remotefilelog extension from hg-experimental...

              r40530
            
              return 0, 0

	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 remotefilelog: import pruned-down remotefilelog extension from hg-experimental...	r40530	# shallowverifier.py - shallow repository verifier
		#
		# Copyright 2015 Facebook, Inc.
		#
		# 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 mercurial.i18n import _
		from mercurial import verify

Augie Fackler formatting: blacken the codebase...	r43346
Augie Fackler remotefilelog: import pruned-down remotefilelog extension from hg-experimental...	r40530	class shallowverifier(verify.verifier):
		def _verifyfiles(self, filenodes, filelinkrevs):
		"""Skips files verification since repo's not guaranteed to have them"""
		self.repo.ui.status(
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	_(b"skipping filelog check since remotefilelog is used\n")
Augie Fackler formatting: blacken the codebase...	r43346	)
Augie Fackler remotefilelog: import pruned-down remotefilelog extension from hg-experimental...	r40530	return 0, 0