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

merge: sort filemap only if requested by the caller...

merge: sort filemap only if requested by the caller The name `sorted` refers to a built-in function, which is always true, so the else branch of this if statement was dead code. Because, with this fix, the function can iterate over the dict items while yielding values, the dict should not change size while the generator is running. Because of that, it is required to re-introduce code that makes a caller copy the filemap before modification, which was removed in (that changeset also introduced the filemap() method including the bug that’s being fixed by this changeset).

Manuel Jacob - - Load All Authors

File last commit:

r50201:2e726c93 default


                r52711:23116aef

stable

Download file

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

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

      from . import encoding

      def mayhavepending(root):

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

          visible to this process.

          """

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

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

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

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

          is equal to 'root'.

          This returns '(fp, is_pending_opened)' tuple.

          """

          if mayhavepending(root):

              try:

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

              except FileNotFoundError:

                  pass

          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

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


				from . import encoding


				def mayhavepending(root):
				"""return whether 'root' may have pending changes, which are
				visible to this process.
				"""
				return root == encoding.environ.get(b'HG_PENDING')


				def trypending(root, vfs, filename, **kwargs):
				"""Open file to be read according to HG_PENDING environment variable

				This opens '.pending' of specified 'filename' only when HG_PENDING
				is equal to 'root'.

				This returns '(fp, is_pending_opened)' tuple.
				"""
				if mayhavepending(root):
				try:
				return (vfs(b'%s.pending' % filename, **kwargs), True)
				except FileNotFoundError:
				pass
				return (vfs(filename, **kwargs), False)