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

largefiles: fix cat of non-largefiles from subdirectory...

largefiles: fix cat of non-largefiles from subdirectory We were calling back to the original commands.cat from inside the walk loop that handled and filtered out largefiles. That did however happen with file paths relative to repo root and the original cat would fail when it applied its own walk and match on top of that. Instead we now duplicate and modify the code from commands.cat and patch it to handle both normal and largefiles. A change in test output shows that this also makes the exit code with largefiles consistent with the normal one in the case where one of several specified files are missing. This also fixes the combination of --output and largefiles.

Mads Kiilerich - - Load All Authors

File last commit:

r18481:ed647c59 stable


                r18974:d78a136a

default

Download file

             wirestore.py
        
                    39 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 2 if the largefile is missing, 1 if it has a

              mismatched checksum, or 0 if it is in good condition'''

              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 2 if the largefile is missing, 1 if it has a
				mismatched checksum, or 0 if it is in good condition'''
				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