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

changegroup: cg3 has two empty groups *after* manifests...

changegroup: cg3 has two empty groups *after* manifests changegroup.getchunks() determines the end of the stream by looking for an empty chunk group (two consecutive empty chunks). It ignores empty groups in the first two groups. Changegroup 3 introduced an empty chunk between the manifests and the files, which confuses getchunks(). Since it comes after the first two, getchunks() will stop there. Fix by rewriting getchunks so it first counts two groups (empty or not) and then keeps antostarts counting empty groups. With this counting, changegroup 1 and 2 have exactly one empty group after the first two groups, while changegroup 3 has two (one for directories and one for files). It's a little hard to test this at this point, but I have verified that this patch fixes narrowhg (which was broken before this patch). Also, future patches will fix "hg strip" with treemanifests, and once that's done, getchunks() will be tested through tests of "hg strip".

Gregory Szorc - - Load All Authors

File last commit:

r27481:029f0275 default


                r27920:da5f2336

stable

Download file

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

      from __future__ import absolute_import

      import _winreg

      import os

      from . import (

          osutil,

          util,

      )

      def systemrcpath():

          '''return default os-specific hgrc search path'''

          rcpath = []

          filename = util.executablepath()

          # Use mercurial.ini found in directory with hg.exe

          progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini')

          rcpath.append(progrc)

          # Use hgrc.d found in directory with hg.exe

          progrcd = os.path.join(os.path.dirname(filename), 'hgrc.d')

          if os.path.isdir(progrcd):

              for f, kind in osutil.listdir(progrcd):

                  if f.endswith('.rc'):

                      rcpath.append(os.path.join(progrcd, f))

          # else look for a system rcpath in the registry

          value = util.lookupreg('SOFTWARE\\Mercurial', None,

                                 _winreg.HKEY_LOCAL_MACHINE)

          if not isinstance(value, str) or not value:

              return rcpath

          value = util.localpath(value)

          for p in value.split(os.pathsep):

              if p.lower().endswith('mercurial.ini'):

                  rcpath.append(p)

              elif os.path.isdir(p):

                  for f, kind in osutil.listdir(p):

                      if f.endswith('.rc'):

                          rcpath.append(os.path.join(p, f))

          return rcpath

      def userrcpath():

          '''return os-specific hgrc search path to the user dir'''

          home = os.path.expanduser('~')

          path = [os.path.join(home, 'mercurial.ini'),

                  os.path.join(home, '.hgrc')]

          userprofile = os.environ.get('USERPROFILE')

          if userprofile and userprofile != home:

              path.append(os.path.join(userprofile, 'mercurial.ini'))

              path.append(os.path.join(userprofile, '.hgrc'))

          return 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

				from __future__ import absolute_import

				import _winreg
				import os

				from . import (
				osutil,
				util,
				)

				def systemrcpath():
				'''return default os-specific hgrc search path'''
				rcpath = []
				filename = util.executablepath()
				# Use mercurial.ini found in directory with hg.exe
				progrc = os.path.join(os.path.dirname(filename), 'mercurial.ini')
				rcpath.append(progrc)
				# Use hgrc.d found in directory with hg.exe
				progrcd = os.path.join(os.path.dirname(filename), 'hgrc.d')
				if os.path.isdir(progrcd):
				for f, kind in osutil.listdir(progrcd):
				if f.endswith('.rc'):
				rcpath.append(os.path.join(progrcd, f))
				# else look for a system rcpath in the registry
				value = util.lookupreg('SOFTWARE\\Mercurial', None,
				_winreg.HKEY_LOCAL_MACHINE)
				if not isinstance(value, str) or not value:
				return rcpath
				value = util.localpath(value)
				for p in value.split(os.pathsep):
				if p.lower().endswith('mercurial.ini'):
				rcpath.append(p)
				elif os.path.isdir(p):
				for f, kind in osutil.listdir(p):
				if f.endswith('.rc'):
				rcpath.append(os.path.join(p, f))
				return rcpath

				def userrcpath():
				'''return os-specific hgrc search path to the user dir'''
				home = os.path.expanduser('~')
				path = [os.path.join(home, 'mercurial.ini'),
				os.path.join(home, '.hgrc')]
				userprofile = os.environ.get('USERPROFILE')
				if userprofile and userprofile != home:
				path.append(os.path.join(userprofile, 'mercurial.ini'))
				path.append(os.path.join(userprofile, '.hgrc'))
				return path