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

largefiles: pay attention to dropped standin files when updating largefiles...

largefiles: pay attention to dropped standin files when updating largefiles Previously, the largefile for a dropped standin would be deleted here, and then restored from the cache. This had the effect of clobbering uncommitted changes if a revert caused the file to be forgotten, which is not what happens with a normal file. Now the removal and update is skipped for dropped largefiles, and the corresponding standin is deleted from disk. This was noticed when working on issue5738 because the forgotten standin files were left behind, and that changes the behavior of the next rename to that directory. My first attempt was to cleanup the standins before calling this. That failed, because this function deletes the largefile if the corresponding standin is missing. This function is called by the revert command, merge (and therefore update), and patch, via the scmutil.marktouched() override. So it should be pretty narrow in scope. I didn't mark issue5738 as fixed because the move related issues can still happen if the main tree and the .hglf subtree get out of sync somehow. I don't see an easy fix for that, but that should be an edge case. If whoever queues this thinks it is good enough to close out the bug and can cram it into the summary, go for it.

Pulkit Goyal - - Load All Authors

File last commit:

r34976:901a18b0 default


                r35175:b175e54c

stable

Download file

             commitextras.py
        
                    76 lines
            
             | 2.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / commitextras.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

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

      from __future__ import absolute_import

      import re

      from mercurial.i18n import _

      from mercurial import (

          commands,

          error,

          extensions,

          registrar,

      )

      cmdtable = {}

      command = registrar.command(cmdtable)

      testedwith = 'ships-with-hg-core'

      usedinternally = {

          'amend_source',

          'branch',

          'close',

          'histedit_source',

          'topic',

          'rebase_source',

          'intermediate-source',

          '__touch-noise__',

          'source',

          'transplant_source',

      }

      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:

                          if '=' not in raw:

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

                                      "KEY=VALUE format")

                              raise error.Abort(msg % raw)

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

                          if not k:

                              msg = _("unable to parse '%s', keys can't be empty")

                              raise error.Abort(msg % raw)

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

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

                                      " '_' and '-'")

                              raise error.Abort(msg)

                          if k in usedinternally:

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

                                      "manually")

                              raise error.Abort(msg % k)

                          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

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

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

				from __future__ import absolute_import

				import re

				from mercurial.i18n import _
				from mercurial import (
				commands,
				error,
				extensions,
				registrar,
				)

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

				usedinternally = {
				'amend_source',
				'branch',
				'close',
				'histedit_source',
				'topic',
				'rebase_source',
				'intermediate-source',
				'__touch-noise__',
				'source',
				'transplant_source',
				}

				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:
				if '=' not in raw:
				msg = _("unable to parse '%s', should follow "
				"KEY=VALUE format")
				raise error.Abort(msg % raw)
				k, v = raw.split('=', 1)
				if not k:
				msg = _("unable to parse '%s', keys can't be empty")
				raise error.Abort(msg % raw)
				if re.search('[^\w-]', k):
				msg = _("keys can only contain ascii letters, digits,"
				" '_' and '-'")
				raise error.Abort(msg)
				if k in usedinternally:
				msg = _("key '%s' is used internally, can't be set "
				"manually")
				raise error.Abort(msg % k)
				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']