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

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Mads Kiilerich - - Load All Authors

File last commit:

r22583:23c995ed default


                r24995:0579b0c2

default

Download file

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

      import os

      import osutil

      import util

      import _winreg

      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')

          if os.path.isfile(progrc):

              rcpath.append(progrc)

              return rcpath

          # 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))

              return rcpath

          # 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

				import os
				import osutil
				import util
				import _winreg

				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')
				if os.path.isfile(progrc):
				rcpath.append(progrc)
				return rcpath
				# 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))
				return rcpath
				# 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