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

checkheads: upgrade the obsolescence postprocessing logic (issue4354)...

checkheads: upgrade the obsolescence postprocessing logic (issue4354) The previous logic had many shortcoming (eg: looking at the head only, not handling prune, etc...), the new logic use a more robust approach: For each head, we check if after the push all changesets exclusive to this heads will be obsolete. If they are, the branch considered be "replaced". To check if a changeset will be obsolete, we simply checks: * the changeset phase * the existence of a marker relevant to the "pushed set" that affects the changesets.. This fixes two major issues of the previous algorithm: * branch partially rewritten (eg: head but not root) are no longer detected as replaced, * Prune are now properly handled. (This implementation was introduction in the evolve extension, version 6.0.0.) This new algorithm has an extended number of tests, a basic one is provided in this patch. The others will be introduced in their own changeset for clarity. In addition, we stop trying to process heads unknown locally, we do not have enough data to take an informed decision so we should stop pretending we do. This reflect a test that is now update.

Augie Fackler - - Load All Authors

File last commit:

r30488:751639bf default


                r32009:c6cb21dd

default

Download file

             dirstateguard.py
        
                    69 lines
            
             | 2.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / dirstateguard.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # dirstateguard.py - class to allow restoring dirstate after failure

      #

      # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>

      #

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

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

      from __future__ import absolute_import

      from .i18n import _

      from . import (

          error,

      )

      class dirstateguard(object):

          '''Restore dirstate at unexpected failure.

          At the construction, this class does:

          - write current ``repo.dirstate`` out, and

          - save ``.hg/dirstate`` into the backup file

          This restores ``.hg/dirstate`` from backup file, if ``release()``

          is invoked before ``close()``.

          This just removes the backup file at ``close()`` before ``release()``.

          '''

          def __init__(self, repo, name):

              self._repo = repo

              self._active = False

              self._closed = False

              self._suffix = '.backup.%s.%d' % (name, id(self))

              repo.dirstate.savebackup(repo.currenttransaction(), self._suffix)

              self._active = True

          def __del__(self):

              if self._active: # still active

                  # this may occur, even if this class is used correctly:

                  # for example, releasing other resources like transaction

                  # may raise exception before ``dirstateguard.release`` in

                  # ``release(tr, ....)``.

                  self._abort()

          def close(self):

              if not self._active: # already inactivated

                  msg = (_("can't close already inactivated backup: dirstate%s")

                         % self._suffix)

                  raise error.Abort(msg)

              self._repo.dirstate.clearbackup(self._repo.currenttransaction(),

                                               self._suffix)

              self._active = False

              self._closed = True

          def _abort(self):

              self._repo.dirstate.restorebackup(self._repo.currenttransaction(),

                                                 self._suffix)

              self._active = False

          def release(self):

              if not self._closed:

                  if not self._active: # already inactivated

                      msg = (_("can't release already inactivated backup:"

                               " dirstate%s")

                             % self._suffix)

                      raise error.Abort(msg)

                  self._abort()

	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

				# dirstateguard.py - class to allow restoring dirstate after failure
				#
				# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				from .i18n import _

				from . import (
				error,
				)

				class dirstateguard(object):
				'''Restore dirstate at unexpected failure.

				At the construction, this class does:

				- write current ``repo.dirstate`` out, and
				- save ``.hg/dirstate`` into the backup file

				This restores ``.hg/dirstate`` from backup file, if ``release()``
				is invoked before ``close()``.

				This just removes the backup file at ``close()`` before ``release()``.
				'''

				def __init__(self, repo, name):
				self._repo = repo
				self._active = False
				self._closed = False
				self._suffix = '.backup.%s.%d' % (name, id(self))
				repo.dirstate.savebackup(repo.currenttransaction(), self._suffix)
				self._active = True

				def __del__(self):
				if self._active: # still active
				# this may occur, even if this class is used correctly:
				# for example, releasing other resources like transaction
				# may raise exception before ``dirstateguard.release`` in
				# ``release(tr, ....)``.
				self._abort()

				def close(self):
				if not self._active: # already inactivated
				msg = (_("can't close already inactivated backup: dirstate%s")
				% self._suffix)
				raise error.Abort(msg)

				self._repo.dirstate.clearbackup(self._repo.currenttransaction(),
				self._suffix)
				self._active = False
				self._closed = True

				def _abort(self):
				self._repo.dirstate.restorebackup(self._repo.currenttransaction(),
				self._suffix)
				self._active = False

				def release(self):
				if not self._closed:
				if not self._active: # already inactivated
				msg = (_("can't release already inactivated backup:"
				" dirstate%s")
				% self._suffix)
				raise error.Abort(msg)
				self._abort()