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

dirstate: expose a sparse matcher on dirstate (API)...

dirstate: expose a sparse matcher on dirstate (API) The sparse extension performs a lot of monkeypatching of dirstate to make it sparse aware. Essentially, various operations need to take the active sparse config into account. They do this by obtaining a matcher representing the sparse config and filtering paths through it. The monkeypatching is done by stuffing a reference to a repo on dirstate and calling sparse.matcher() (which takes a repo instance) during each function call. The reason this function takes a repo instance is because resolving the sparse config may require resolving file contents from filelogs, and that requires a repo. (If the current sparse config references "profile" files, the contents of those files from the dirstate's parent revisions is resolved.) I seem to recall people having strong opinions that the dirstate object not have a reference to a repo. So copying what the sparse extension does probably won't fly in core. Plus, the dirstate modifications shouldn't require a full repo: they only need a matcher. So there's no good reason to stuff a reference to the repo in dirstate. This commit exposes a sparse matcher to dirstate via a property that when looked up will call a function that eventually calls sparse.matcher(). The repo instance is bound in a closure, so it isn't exposed to dirstate. This approach is functionally similar to what the sparse extension does today, except it hides the repo instance from dirstate. The approach is not optimal because we have to call a proxy function and sparse.matcher() on every property lookup. There is room to cache the matcher instance in dirstate. After all, the matcher only changes if the dirstate's parents change or if the sparse config changes. It feels like we should be able to detect both events and update the matcher when this occurs. But for now we preserve the existing semantics so we can move the dirstate sparseness bits into core. Once in core, refactoring becomes a bit easier since it will be clearer how all these components interact. The sparse extension has been updated to use the new property. Because all references to the repo on dirstate have been removed, the code for setting it has been removed.

Yuya Nishihara - - Load All Authors

File last commit:

r32684:af854b1b default


                r33373:fb320398

default

Download file

             node.py
        
                    35 lines
            
             | 917 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / node.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
put license and copyright info into comment blocks

              r8226
            
      # node.py - basic nodeid manipulation for mercurial

      #

      # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>

      #

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

        Matt Mackall
    
Update license to GPLv2+

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

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Gregory Szorc
    
node: use absolute_import

              r25962
            
      from __future__ import absolute_import

        Matt Mackall
    
Replace demandload with new demandimport

              r3877
            
      import binascii

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Siddharth Agarwal
    
node: add 'nullhex', hex-encoded nullid...

              r26980
            
      # This ugly style has a noticeable effect in manifest parsing

      hex = binascii.hexlify

      bin = binascii.unhexlify

        Thomas Arendsen Hein
    
Define and use nullrev (revision of nullid) instead of -1.

              r3578
            
      nullrev = -1

        Gregory Szorc
    
node: use byte literals to construct nullid and wdirid...

              r28585
            
      nullid = b"\0" * 20

        Siddharth Agarwal
    
node: add 'nullhex', hex-encoded nullid...

              r26980
            
      nullhex = hex(nullid)

        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
        Durham Goode
    
dirstate: change placeholder hash length to 20 bytes...

              r30360
            
      # Phony node value to stand-in for new files in some uses of

      # manifests.

      newnodeid = '!' * 20

        Durham Goode
    
dirstate: change added/modified placeholder hash length to 20 bytes...

              r30361
            
      addednodeid = ('0' * 15) + 'added'

      modifiednodeid = ('0' * 12) + 'modified'

        Durham Goode
    
dirstate: change placeholder hash length to 20 bytes...

              r30360
            
        Martin von Zweigbergk
    
cleanup: use set literals...

              r32291
            
      wdirnodes = {newnodeid, addednodeid, modifiednodeid}

        Durham Goode
    
dirstate: change placeholder hash length to 20 bytes...

              r30360
            
        Yuya Nishihara
    
node: define experimental identifiers for working directory...

              r25737
            
      # pseudo identifiers for working directory

      # (they are experimental, so don't add too many dependencies on them)

      wdirrev = 0x7fffffff

        Gregory Szorc
    
node: use byte literals to construct nullid and wdirid...

              r28585
            
      wdirid = b"\xff" * 20

        Yuya Nishihara
    
revlog: add support for partial matching of wdir node id...

              r32684
            
      wdirhex = hex(wdirid)

        Yuya Nishihara
    
node: define experimental identifiers for working directory...

              r25737
            
        mpm@selenic.com
    
Break apart hg.py...

              r1089
            
      def short(node):

          return hex(node[:6])

	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

Martin Geisler put license and copyright info into comment blocks	r8226	# node.py - basic nodeid manipulation for mercurial
		#
		# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
		#
		# This software may be used and distributed according to the terms of the
Matt Mackall Update license to GPLv2+	r10263	# GNU General Public License version 2 or any later version.
mpm@selenic.com Break apart hg.py...	r1089
Gregory Szorc node: use absolute_import	r25962	from __future__ import absolute_import

Matt Mackall Replace demandload with new demandimport	r3877	import binascii
mpm@selenic.com Break apart hg.py...	r1089
Siddharth Agarwal node: add 'nullhex', hex-encoded nullid...	r26980	# This ugly style has a noticeable effect in manifest parsing
		hex = binascii.hexlify
		bin = binascii.unhexlify

Thomas Arendsen Hein Define and use nullrev (revision of nullid) instead of -1.	r3578	nullrev = -1
Gregory Szorc node: use byte literals to construct nullid and wdirid...	r28585	nullid = b"\0" * 20
Siddharth Agarwal node: add 'nullhex', hex-encoded nullid...	r26980	nullhex = hex(nullid)
mpm@selenic.com Break apart hg.py...	r1089
Durham Goode dirstate: change placeholder hash length to 20 bytes...	r30360	# Phony node value to stand-in for new files in some uses of
		# manifests.
		newnodeid = '!' * 20
Durham Goode dirstate: change added/modified placeholder hash length to 20 bytes...	r30361	addednodeid = ('0' * 15) + 'added'
		modifiednodeid = ('0' * 12) + 'modified'
Durham Goode dirstate: change placeholder hash length to 20 bytes...	r30360
Martin von Zweigbergk cleanup: use set literals...	r32291	wdirnodes = {newnodeid, addednodeid, modifiednodeid}
Durham Goode dirstate: change placeholder hash length to 20 bytes...	r30360
Yuya Nishihara node: define experimental identifiers for working directory...	r25737	# pseudo identifiers for working directory
		# (they are experimental, so don't add too many dependencies on them)
		wdirrev = 0x7fffffff
Gregory Szorc node: use byte literals to construct nullid and wdirid...	r28585	wdirid = b"\xff" * 20
Yuya Nishihara revlog: add support for partial matching of wdir node id...	r32684	wdirhex = hex(wdirid)
Yuya Nishihara node: define experimental identifiers for working directory...	r25737
mpm@selenic.com Break apart hg.py...	r1089	def short(node):
		return hex(node[:6])