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

copies: detect files as `touched/salvaged` if they only existed on one side...

copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

Augie Fackler - - Load All Authors

File last commit:

r46554:89a2afe3 default


                r47570:c52c3c4c

default

Download file

             wirestore.py
        
                    52 lines
            
             | 1.6 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'''

      from __future__ import absolute_import

      from . import (

          lfutil,

          remotestore,

      )

      class wirestore(remotestore.remotestore):

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

              cap = remote.capable(b'largefiles')

              if not cap:

                  raise lfutil.storeprotonotcapable([])

              storetypes = cap.split(b',')

              if b'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."""

              with self.remote.commandexecutor() as e:

                  fs = []

                  for hash in hashes:

                      fs.append(

                          (

                              hash,

                              e.callcommand(

                                  b'statlfile',

                                  {

                                      b'sha': hash,

                                  },

                              ),

                          )

                      )

                  return {hash: f.result() for hash, f in fs}

	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'''
				from __future__ import absolute_import

				from . import (
				lfutil,
				remotestore,
				)


				class wirestore(remotestore.remotestore):
				def __init__(self, ui, repo, remote):
				cap = remote.capable(b'largefiles')
				if not cap:
				raise lfutil.storeprotonotcapable([])
				storetypes = cap.split(b',')
				if b'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."""

				with self.remote.commandexecutor() as e:
				fs = []
				for hash in hashes:
				fs.append(
				(
				hash,
				e.callcommand(
				b'statlfile',
				{
				b'sha': hash,
				},
				),
				)
				)

				return {hash: f.result() for hash, f in fs}