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

fix pull racing with push/commit (issue1320)...

fix pull racing with push/commit (issue1320) changegroup() has a problem when nodes which does not descend from a node in <bases> are added to remote after the discovery phase. If that happens, changegroup() won't send the correct set of nodes, ie. some nodes will be missing. To correct it we have to find the set of nodes that both remote and self have (called <common>), and send all the nodes not in <common>. This fix has some overhead, in the worst case it will re-send a whole branch. A proper fix to avoid this overhead might be to change the protocol so that the <common> nodes are sent (instead of the <bases> of the missing nodes).

Bryan O'Sullivan - - Load All Authors

File last commit:

r6526:cfeeac24 default


                r7233:9f0e52e1

default

Download file

             repo.py
        
                    48 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / repo.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # repo.py - repository base classes for mercurial

      #

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

      # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>

      #

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

      # of the GNU General Public License, incorporated herein by reference.

      from i18n import _

      class RepoError(Exception):

          pass

      class NoCapability(RepoError):

          pass

      class repository(object):

          def capable(self, name):

              '''tell whether repo supports named capability.

              return False if not supported.

              if boolean capability, return True.

              if string capability, return string.'''

              if name in self.capabilities:

                  return True

              name_eq = name + '='

              for cap in self.capabilities:

                  if cap.startswith(name_eq):

                      return cap[len(name_eq):]

              return False

          def requirecap(self, name, purpose):

              '''raise an exception if the given capability is not present'''

              if not self.capable(name):

                  raise NoCapability(_('cannot %s; remote repository does not '

                                       'support the %r capability') %

                                     (purpose, name))

          def local(self):

              return False

          def cancopy(self):

              return self.local()

          def rjoin(self, path):

              url = self.url()

              if url.endswith('/'):

                  return url + path

              return url + '/' + path

	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

				# repo.py - repository base classes for mercurial
				#
				# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
				# Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
				#
				# This software may be used and distributed according to the terms
				# of the GNU General Public License, incorporated herein by reference.

				from i18n import _

				class RepoError(Exception):
				pass

				class NoCapability(RepoError):
				pass

				class repository(object):
				def capable(self, name):
				'''tell whether repo supports named capability.
				return False if not supported.
				if boolean capability, return True.
				if string capability, return string.'''
				if name in self.capabilities:
				return True
				name_eq = name + '='
				for cap in self.capabilities:
				if cap.startswith(name_eq):
				return cap[len(name_eq):]
				return False

				def requirecap(self, name, purpose):
				'''raise an exception if the given capability is not present'''
				if not self.capable(name):
				raise NoCapability(_('cannot %s; remote repository does not '
				'support the %r capability') %
				(purpose, name))

				def local(self):
				return False

				def cancopy(self):
				return self.local()

				def rjoin(self, path):
				url = self.url()
				if url.endswith('/'):
				return url + path
				return url + '/' + path