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

destupdate: move the check related to the "clean" logic in the function...

destupdate: move the check related to the "clean" logic in the function We want this function to exactly predict the behavior for update. Moreover, we would like to remove all high level behavior logic out of the merge module so this is a step forward. Now that the 'destupdate' function both compute and validate the destination, we can directly use it at the command level, ensuring that the 'hg update' command never call 'merge.update' without a defined destination. This is a first (but significant) step toward having 'merge.update' always feed with a properly validated destination and free of high level logic.

Mads Kiilerich - - Load All Authors

File last commit:

r22583:23c995ed default


                r26628:45b86dba

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