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

strip: don't allow empty changegroup in bundle1...

strip: don't allow empty changegroup in bundle1 Applying an empty changegroup has been an error since the beginning. The only exception was strip, which would allow to apply an empty changegroup from the temporary bundle. However, the emptyok=True option was only set for bundle1 bundles. In other words, temporary bundle2 bundles would fail if they were empty. Bundle2 has now been used enough that it seems safe to say that we simply don't create bundle2 bundles with empty changegroups. That also suggests that we never create bundle1 bundles with empty changegroups (i.e. empty bundle1 bundles, since bundle1 is just a changegroup), because, AFAICT, the code leading up to the application of the bundle is the same for bundle1 and bundle2. Therefore, let's stop passing emptyok=True, so we more clearly get the same behavior for bundle1 and bundle2.

Yuya Nishihara - - Load All Authors

File last commit:

r32203:d74b0cff default


                r33307:665271d6

default

Download file

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

      from __future__ import absolute_import

      import os

      from . import (

          encoding,

          pycompat,

          util,

          win32,

      )

      try:

          import _winreg as winreg

          winreg.CloseKey

      except ImportError:

          import winreg

      # MS-DOS 'more' is the only pager available by default on Windows.

      fallbackpager = 'more'

      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 util.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(pycompat.ospathsep):

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

                  rcpath.append(p)

              elif os.path.isdir(p):

                  for f, kind in util.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 = encoding.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

      def termsize(ui):

          return win32.termsize()

	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 os

				from . import (
				encoding,
				pycompat,
				util,
				win32,
				)

				try:
				import _winreg as winreg
				winreg.CloseKey
				except ImportError:
				import winreg

				# MS-DOS 'more' is the only pager available by default on Windows.
				fallbackpager = 'more'

				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 util.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(pycompat.ospathsep):
				if p.lower().endswith('mercurial.ini'):
				rcpath.append(p)
				elif os.path.isdir(p):
				for f, kind in util.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 = encoding.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

				def termsize(ui):
				return win32.termsize()