upstream/mercurial-mirror Files · hgext/largefiles/wirestore.py

merge: refactor unknown file conflict checking...

merge: refactor unknown file conflict checking Previously, we would do a full working directory walk including unknown files to perform a merge. In many cases, this was painful because unknown files greatly outnumbered tracked files and generally had no useful effect on the merge. Here we instead wait until we find a file in the destination that's not tracked locally and detect if it exists and is not ignored. This is usually cheaper but can be -more- expensive in the case where we're adding a huge number of files. On the other hand, the cost of statting the new files should be dwarfed by the cost of eventually writing them. In this version, case collisions are detected implicitly by os.path.exists and wctx[f] lookup.

Greg Ward - - Load All Authors

File last commit:

r15252:6e809bb4 default


                r16093:7e30f5f2

default

Download file

             wirestore.py
        
                    29 lines
            
             | 914 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / largefiles / wirestore.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Copyright 2010-2011 Fog Creek Software

      #

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

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

      '''largefile store working over Mercurial's wire protocol'''

      import lfutil

      import remotestore

      class wirestore(remotestore.remotestore):

          def __init__(self, ui, repo, remote):

              cap = remote.capable('largefiles')

              if not cap:

                  raise lfutil.storeprotonotcapable([])

              storetypes = cap.split(',')

              if not 'serve' in storetypes:

                  raise lfutil.storeprotonotcapable(storetypes)

              self.remote = remote

              super(wirestore, self).__init__(ui, repo, remote.url())

          def _put(self, hash, fd):

              return self.remote.putlfile(hash, fd)

          def _get(self, hash):

              return self.remote.getlfile(hash)

          def _stat(self, hash):

              return self.remote.statlfile(hash)

	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 2010-2011 Fog Creek Software
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				'''largefile store working over Mercurial's wire protocol'''

				import lfutil
				import remotestore

				class wirestore(remotestore.remotestore):
				def __init__(self, ui, repo, remote):
				cap = remote.capable('largefiles')
				if not cap:
				raise lfutil.storeprotonotcapable([])
				storetypes = cap.split(',')
				if not 'serve' in storetypes:
				raise lfutil.storeprotonotcapable(storetypes)
				self.remote = remote
				super(wirestore, self).__init__(ui, repo, remote.url())

				def _put(self, hash, fd):
				return self.remote.putlfile(hash, fd)

				def _get(self, hash):
				return self.remote.getlfile(hash)

				def _stat(self, hash):
				return self.remote.statlfile(hash)