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

merge: collect checking for unknown files at end of manifestmerge()...

merge: collect checking for unknown files at end of manifestmerge() The 'c' and 'dc' actions include creating a file on disk and we need to check that no conflicting file exists unless force=True. Move two of the calls to _checkunknownfile() to a single place at the end of manifestmerge(). This removes some of the reading of filelogs from the heart of manifestmerge() and collects it in one place close to where its output (entries in the 'aborts' list) is used. Note that this removes the unnecessary call to _checkunknownfile() when force=True in one of the code paths.

Mads Kiilerich - - Load All Authors

File last commit:

r19008:9d33d6e0 default


                r23651:72da02d7

default

Download file

             wirestore.py
        
                    40 lines
            
             | 1.3 KiB
            
                | 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 'serve' not 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, hashes):

              '''For each hash, return 0 if it is available, other values if not.

              It is usually 2 if the largefile is missing, but might be 1 the server

              has a corrupted copy.'''

              batch = self.remote.batch()

              futures = {}

              for hash in hashes:

                  futures[hash] = batch.statlfile(hash)

              batch.submit()

              retval = {}

              for hash in hashes:

                  retval[hash] = futures[hash].value

              return retval

	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 'serve' not 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, hashes):
				'''For each hash, return 0 if it is available, other values if not.
				It is usually 2 if the largefile is missing, but might be 1 the server
				has a corrupted copy.'''
				batch = self.remote.batch()
				futures = {}
				for hash in hashes:
				futures[hash] = batch.statlfile(hash)
				batch.submit()
				retval = {}
				for hash in hashes:
				retval[hash] = futures[hash].value
				return retval