upstream/mercurial-mirror Files · hgext/commitextras.py

statichttprepo: implement wlock() (issue5613)...

statichttprepo: implement wlock() (issue5613) statichttprepo inherits from localrepository. In doing so, it obtains default implementations of various methods, like wlock(). Before this change, tags cache writing would call repo.wlock(). This failed on statichttprepo due to localrepository's wlock() looking for an instance attribute that doesn't exist on statichttprepo (statichttprepo doesn't call localrepository.__init__). We /could/ define missing attributes until the base wlock() works. However, a statichttprepo is remote and read-only and can't be locked. The class already has a lock() that short circuits. So it makes sense to implement a short-circuited wlock() as well. That is what this patch does. LockError is expected to be raised when locking fails. The constructor takes a number of arguments that are local repository centric. Rather than rework LockError to not require them (which would not be appropriate for stable), this commit populates dummy values. I don't believe they'll ever be seen by the user, as lock failures on static http repos should be limited to well-defined (and tested) scenarios. We can and should revisit the LockError type to improve this.

Pulkit Goyal - - Load All Authors

File last commit:

r33603:27fbca75 stable


                r33605:8b00c723

stable

Download file

             commitextras.py
        
                    73 lines
            
             | 2.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / commitextras.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pulkit Goyal
    
commitextras: move fb extension to core which add extras to a commit...

              r33546
            
      # commitextras.py

      #

      # Copyright 2013 Facebook, Inc.

      #

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

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

        Pulkit Goyal
    
commitextras: mark the extension as ADVANCED

              r33562
            
      '''adds a new flag extras to commit (ADVANCED)'''

        Pulkit Goyal
    
commitextras: move fb extension to core which add extras to a commit...

              r33546
            
      from __future__ import absolute_import

        Pulkit Goyal
    
commitextras: make sure keys contains ascii letters, numbers, '_' and '-' only

              r33603
            
      import re

        Pulkit Goyal
    
commitextras: move fb extension to core which add extras to a commit...

              r33546
            
      from mercurial.i18n import _

      from mercurial import (

          commands,

        Pulkit Goyal
    
commitextras: check the format of the arguments and no internal key is used...

              r33547
            
          error,

        Pulkit Goyal
    
commitextras: move fb extension to core which add extras to a commit...

              r33546
            
          extensions,

          registrar,

      )

      cmdtable = {}

      command = registrar.command(cmdtable)

      testedwith = 'ships-with-hg-core'

        Pulkit Goyal
    
commitextras: check the format of the arguments and no internal key is used...

              r33547
            
      usedinternally = {

          'amend_source',

          'branch',

          'close',

          'histedit_source',

          'topic',

          'rebase_source',

          'intermediate-source',

          '__touch-noise__',

          'source',

          'transplant_source',

      }

        Pulkit Goyal
    
commitextras: move fb extension to core which add extras to a commit...

              r33546
            
      def extsetup(ui):

          entry = extensions.wrapcommand(commands.table, 'commit', _commit)

          options = entry[1]

          options.append(('', 'extra', [],

              _('set a changeset\'s extra values'), _("KEY=VALUE")))

      def _commit(orig, ui, repo, *pats, **opts):

          origcommit = repo.commit

          try:

              def _wrappedcommit(*innerpats, **inneropts):

                  extras = opts.get('extra')

                  if extras:

                      for raw in extras:

        Pulkit Goyal
    
commitextras: check the format of the arguments and no internal key is used...

              r33547
            
                          if '=' not in raw:

                              msg = _("unable to parse '%s', should follow "

                                      "KEY=VALUE format")

                              raise error.Abort(msg % raw)

        Pulkit Goyal
    
commitextras: move fb extension to core which add extras to a commit...

              r33546
            
                          k, v = raw.split('=', 1)

        Pulkit Goyal
    
commitextras: make sure keys contains ascii letters, numbers, '_' and '-' only

              r33603
            
                          if re.search('[^\w-]', k):

                              msg = _("keys can only contain ascii letters, digits,"

                                      " '_' and '-'")

                              raise error.Abort(msg)

        Pulkit Goyal
    
commitextras: check the format of the arguments and no internal key is used...

              r33547
            
                          if k in usedinternally:

                              msg = _("key '%s' is used internally, can't be set "

                                      "manually")

                              raise error.Abort(msg % k)

        Pulkit Goyal
    
commitextras: move fb extension to core which add extras to a commit...

              r33546
            
                          inneropts['extra'][k] = v

                  return origcommit(*innerpats, **inneropts)

              # This __dict__ logic is needed because the normal

              # extension.wrapfunction doesn't seem to work.

              repo.__dict__['commit'] = _wrappedcommit

              return orig(ui, repo, *pats, **opts)

          finally:

              del repo.__dict__['commit']

	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

Pulkit Goyal commitextras: move fb extension to core which add extras to a commit...	r33546	# commitextras.py
		#
		# Copyright 2013 Facebook, Inc.
		#
		# This software may be used and distributed according to the terms of the
		# GNU General Public License version 2 or any later version.

Pulkit Goyal commitextras: mark the extension as ADVANCED	r33562	'''adds a new flag extras to commit (ADVANCED)'''
Pulkit Goyal commitextras: move fb extension to core which add extras to a commit...	r33546
		from __future__ import absolute_import

Pulkit Goyal commitextras: make sure keys contains ascii letters, numbers, '_' and '-' only	r33603	import re

Pulkit Goyal commitextras: move fb extension to core which add extras to a commit...	r33546	from mercurial.i18n import _
		from mercurial import (
		commands,
Pulkit Goyal commitextras: check the format of the arguments and no internal key is used...	r33547	error,
Pulkit Goyal commitextras: move fb extension to core which add extras to a commit...	r33546	extensions,
		registrar,
		)

		cmdtable = {}
		command = registrar.command(cmdtable)
		testedwith = 'ships-with-hg-core'

Pulkit Goyal commitextras: check the format of the arguments and no internal key is used...	r33547	usedinternally = {
		'amend_source',
		'branch',
		'close',
		'histedit_source',
		'topic',
		'rebase_source',
		'intermediate-source',
		'__touch-noise__',
		'source',
		'transplant_source',
		}

Pulkit Goyal commitextras: move fb extension to core which add extras to a commit...	r33546	def extsetup(ui):
		entry = extensions.wrapcommand(commands.table, 'commit', _commit)
		options = entry[1]
		options.append(('', 'extra', [],
		_('set a changeset\'s extra values'), _("KEY=VALUE")))

		def _commit(orig, ui, repo, pats, *opts):
		origcommit = repo.commit
		try:
		def _wrappedcommit(innerpats, *inneropts):
		extras = opts.get('extra')
		if extras:
		for raw in extras:
Pulkit Goyal commitextras: check the format of the arguments and no internal key is used...	r33547	if '=' not in raw:
		msg = _("unable to parse '%s', should follow "
		"KEY=VALUE format")
		raise error.Abort(msg % raw)
Pulkit Goyal commitextras: move fb extension to core which add extras to a commit...	r33546	k, v = raw.split('=', 1)
Pulkit Goyal commitextras: make sure keys contains ascii letters, numbers, '_' and '-' only	r33603	if re.search('[^\w-]', k):
		msg = _("keys can only contain ascii letters, digits,"
		" '_' and '-'")
		raise error.Abort(msg)
Pulkit Goyal commitextras: check the format of the arguments and no internal key is used...	r33547	if k in usedinternally:
		msg = _("key '%s' is used internally, can't be set "
		"manually")
		raise error.Abort(msg % k)
Pulkit Goyal commitextras: move fb extension to core which add extras to a commit...	r33546	inneropts['extra'][k] = v
		return origcommit(innerpats, *inneropts)

		# This __dict__ logic is needed because the normal
		# extension.wrapfunction doesn't seem to work.
		repo.__dict__['commit'] = _wrappedcommit
		return orig(ui, repo, pats, *opts)
		finally:
		del repo.__dict__['commit']