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

context: skip path conflicts by default when clearing unknown file (issue5776)...

context: skip path conflicts by default when clearing unknown file (issue5776) Prior to adding path conflict checking in 989e884d1be9, the test-audit-path.t tests failed as shown here (but it was globbed away). made it fail with a message about the destination manifest containing a conflict (though the no-symlink case wasn't updated). When the path conflict checking was gated behind an experimental config in 2a774cae3a03^::2a774cae3a03, the update started erroneously succeeding here. It turns out that the child of is the origin of this change when path conflict checking is disabled, as shown by grafting the experimental config range on top of it. What's happening here is merge.batchget() is writing the symlink 'back' to wdir (but as a regular file for the no-symlink case), and then tries to write 'back/test', but calls wctx['back/test'].clearunknown() first. The code that's gated here was removing the newly written 'back' file, allowing 'back/test' to succeed. I tried checking for the dir components of 'back/test' in dirstate, and skipping removal if present. But that didn't work because the dirstate isn't updated after each file is written out. This is the last persistent test failure on Windows, so the testbot should start turning green now. \o/

Martin von Zweigbergk - - Load All Authors

File last commit:

r33790:bbbbd3c3 default


                r37119:656ac240

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,

          util,

      )

      class dirstateguard(util.transactional):

          '''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._backupname = 'dirstate.backup.%s.%d' % (name, id(self))

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

              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: %s")

                         % self._backupname)

                  raise error.Abort(msg)

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

                                               self._backupname)

              self._active = False

              self._closed = True

          def _abort(self):

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

                                                 self._backupname)

              self._active = False

          def release(self):

              if not self._closed:

                  if not self._active: # already inactivated

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

                             % self._backupname)

                      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,
				util,
				)

				class dirstateguard(util.transactional):
				'''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._backupname = 'dirstate.backup.%s.%d' % (name, id(self))
				repo.dirstate.savebackup(repo.currenttransaction(), self._backupname)
				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: %s")
				% self._backupname)
				raise error.Abort(msg)

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

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

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