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

localrepo: put bookmark move following commit in one transaction...

localrepo: put bookmark move following commit in one transaction Before this patch, making a commit on a local repo could move a bookmark and both operations would not be grouped as one transaction. This patch makes both operations part of one transaction. This is necessary to switch to the new api to save bookmarks repo._bookmarks.recordchange if we don't want to change the current behavior of rollback. Dirstate change happening after the commit is done is now part of the transaction mentioned above. This leads to a change in the expected output of several tests. The change to test-fncache happens because both lock are now released in the same finally clause. The lock release is made explicitly buggy in this test. Previously releasing lock would crash triggering release of wlock that crashes too. Now lock release crash does not directly result in the release of wlock. Instead wlock is released at garbage collection time and the error raised at that time "confuses" python.

Mads Kiilerich - - Load All Authors

File last commit:

r22583:23c995ed default


                r26998:4414d500

default

Download file

             scmposix.py
        
                    33 lines
            
             | 902 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / scmposix.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      import sys, os

      import osutil

      def _rcfiles(path):

          rcs = [os.path.join(path, 'hgrc')]

          rcdir = os.path.join(path, 'hgrc.d')

          try:

              rcs.extend([os.path.join(rcdir, f)

                          for f, kind in osutil.listdir(rcdir)

                          if f.endswith(".rc")])

          except OSError:

              pass

          return rcs

      def systemrcpath():

          path = []

          if sys.platform == 'plan9':

              root = 'lib/mercurial'

          else:

              root = 'etc/mercurial'

          # old mod_python does not set sys.argv

          if len(getattr(sys, 'argv', [])) > 0:

              p = os.path.dirname(os.path.dirname(sys.argv[0]))

              if p != '/':

                  path.extend(_rcfiles(os.path.join(p, root)))

          path.extend(_rcfiles('/' + root))

          return path

      def userrcpath():

          if sys.platform == 'plan9':

              return [os.environ['home'] + '/lib/hgrc']

          else:

              return [os.path.expanduser('~/.hgrc')]

	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 sys, os
				import osutil

				def _rcfiles(path):
				rcs = [os.path.join(path, 'hgrc')]
				rcdir = os.path.join(path, 'hgrc.d')
				try:
				rcs.extend([os.path.join(rcdir, f)
				for f, kind in osutil.listdir(rcdir)
				if f.endswith(".rc")])
				except OSError:
				pass
				return rcs

				def systemrcpath():
				path = []
				if sys.platform == 'plan9':
				root = 'lib/mercurial'
				else:
				root = 'etc/mercurial'
				# old mod_python does not set sys.argv
				if len(getattr(sys, 'argv', [])) > 0:
				p = os.path.dirname(os.path.dirname(sys.argv[0]))
				if p != '/':
				path.extend(_rcfiles(os.path.join(p, root)))
				path.extend(_rcfiles('/' + root))
				return path

				def userrcpath():
				if sys.platform == 'plan9':
				return [os.environ['home'] + '/lib/hgrc']
				else:
				return [os.path.expanduser('~/.hgrc')]