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

dispatch: change cwd when loading local config...

dispatch: change cwd when loading local config Previously, the `_getlocal` function would not correctly load the repo config when given a relative `rpath` and an alternate cwd via the `wd` parameter. Normally when `--cwd` is specified, hg changes to the given directory before attempting to load the local config (and therefore does not specify a `wd`). The only time the function is called with `wd` set is when hg is running as a command server (e.g., with chg), in which case each forked worker process will attempt to configure itself via `_getlocal` before responding to the client. When given a relative repo path, the worker fails to load the repo config, detects a config mismatch with the client, and enters a redirect/respawn loop. To fix this, we can simply change to the desired working directory during config loading. (Note that simply concatenating `wd` and `rpath` won't work in all cases. The repo path could be something more complicated than a simple relative path, such as a `union:` repo.)

Manuel Jacob - - Load All Authors

File last commit:

r50201:2e726c93 default


                r50317:3681a476

default

Download file

             txnutil.py
        
                    32 lines
            
             | 943 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / txnutil.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        FUJIWARA Katsunori
    
txnutil: factor out the logic to read file in according to HG_PENDING...

              r31050
            
      # txnutil.py - transaction related utilities

      #

      #  Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others

      #

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

      # GNU General Public License version 2 or any later version.

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
      from . import encoding

        FUJIWARA Katsunori
    
txnutil: factor out the logic to read file in according to HG_PENDING...

              r31050
            
      def mayhavepending(root):

        Augie Fackler
    
formating: upgrade to black 20.8b1...

              r46554
            
          """return whether 'root' may have pending changes, which are

        FUJIWARA Katsunori
    
txnutil: factor out the logic to read file in according to HG_PENDING...

              r31050
            
          visible to this process.

        Augie Fackler
    
formating: upgrade to black 20.8b1...

              r46554
            
          """

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
          return root == encoding.environ.get(b'HG_PENDING')

        FUJIWARA Katsunori
    
txnutil: factor out the logic to read file in according to HG_PENDING...

              r31050
            
        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        FUJIWARA Katsunori
    
txnutil: factor out the logic to read file in according to HG_PENDING...

              r31050
            
      def trypending(root, vfs, filename, **kwargs):

        Augie Fackler
    
formating: upgrade to black 20.8b1...

              r46554
            
          """Open  file to be read according to HG_PENDING environment variable

        FUJIWARA Katsunori
    
txnutil: factor out the logic to read file in according to HG_PENDING...

              r31050
            
          This opens '.pending' of specified 'filename' only when HG_PENDING

          is equal to 'root'.

          This returns '(fp, is_pending_opened)' tuple.

        Augie Fackler
    
formating: upgrade to black 20.8b1...

              r46554
            
          """

        FUJIWARA Katsunori
    
txnutil: factor out the logic to read file in according to HG_PENDING...

              r31050
            
          if mayhavepending(root):

              try:

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
                  return (vfs(b'%s.pending' % filename, **kwargs), True)

        Manuel Jacob
    
py3: catch FileNotFoundError instead of checking errno == ENOENT

              r50201
            
              except FileNotFoundError:

                  pass

        FUJIWARA Katsunori
    
txnutil: factor out the logic to read file in according to HG_PENDING...

              r31050
            
          return (vfs(filename, **kwargs), False)

	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

FUJIWARA Katsunori txnutil: factor out the logic to read file in according to HG_PENDING...	r31050	# txnutil.py - transaction related utilities
		#
		# Copyright FUJIWARA Katsunori <foozy@lares.dti.ne.jp> and others
		#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.


Augie Fackler formatting: blacken the codebase...	r43346	from . import encoding

FUJIWARA Katsunori txnutil: factor out the logic to read file in according to HG_PENDING...	r31050
		def mayhavepending(root):
Augie Fackler formating: upgrade to black 20.8b1...	r46554	"""return whether 'root' may have pending changes, which are
FUJIWARA Katsunori txnutil: factor out the logic to read file in according to HG_PENDING...	r31050	visible to this process.
Augie Fackler formating: upgrade to black 20.8b1...	r46554	"""
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	return root == encoding.environ.get(b'HG_PENDING')
FUJIWARA Katsunori txnutil: factor out the logic to read file in according to HG_PENDING...	r31050
Augie Fackler formatting: blacken the codebase...	r43346
FUJIWARA Katsunori txnutil: factor out the logic to read file in according to HG_PENDING...	r31050	def trypending(root, vfs, filename, **kwargs):
Augie Fackler formating: upgrade to black 20.8b1...	r46554	"""Open file to be read according to HG_PENDING environment variable
FUJIWARA Katsunori txnutil: factor out the logic to read file in according to HG_PENDING...	r31050
		This opens '.pending' of specified 'filename' only when HG_PENDING
		is equal to 'root'.

		This returns '(fp, is_pending_opened)' tuple.
Augie Fackler formating: upgrade to black 20.8b1...	r46554	"""
FUJIWARA Katsunori txnutil: factor out the logic to read file in according to HG_PENDING...	r31050	if mayhavepending(root):
		try:
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	return (vfs(b'%s.pending' % filename, **kwargs), True)
Manuel Jacob py3: catch FileNotFoundError instead of checking errno == ENOENT	r50201	except FileNotFoundError:
		pass
FUJIWARA Katsunori txnutil: factor out the logic to read file in according to HG_PENDING...	r31050	return (vfs(filename, **kwargs), False)