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

subrepo: propagate the --hidden option to hg subrepositories...

subrepo: propagate the --hidden option to hg subrepositories With many commands accepting a '-S' or an explicit path to trigger recursing into subrepos, it seems that --hidden needs to be propagated too. Unfortunately, many of the subrepo layer methods discard the options map, so passing the option along explicitly isn't currently an option. It also isn't clear if other filtered views need to be propagated, so changing all of those commands may be insufficient anyway. The specific jam I got into was amending an ancestor of qbase in a subrepo, and then evolving. The patch ended up being hidden, and outgoing said it would only push one unrelated commit. But push aborted with an 'unknown revision' that I traced back to the patch. (Odd it didn't say 'filtered revision'.) A push with --hidden worked from the subrepo, but that wasn't possible from the parent repo before this. Since the underlying problem doesn't actually require a subrepo, there's probably more to investigate here in the discovery area. Yes, evolve + mq is not exactly sane, but I don't know what is seeing the hidden revision. In lieu of creating a test for the above situation (evolving mq should probably be blocked), the test here is a marginally useful case where --hidden is needed in a subrepo: cat'ing a file in a hidden revision. Without this change, cat aborts with: $ hg --hidden cat subrepo/a skipping missing subrepository: subrepo [1]

Mads Kiilerich - - Load All Authors

File last commit:

r22583:23c995ed default


                r24877:cc497780

stable

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