##// END OF EJS Templates
update: fix spurious unclean status bug shown by previous commit...
update: fix spurious unclean status bug shown by previous commit The crux of the problem is: - the dirstate is corrupted (the sizes/dates are assigned to the wrong files) - because when worker.worker is used with a return value (batchget in merge.py here), the return value when worker.worker effectively parallelizes is permuted - this is because worker.worker's partition of input and combination of output values are not inverses of one another: it split [1,2,3,4,5,6] into [[1,3,5],[2,4,6]], but combines that into [1,3,5,2,4,6]. Given that worker.worker doesn't call its function argument on contiguous chunks on the input arguments, sticking with lists means we'd need to know the relation between the inputs of worker.worker function argument (for instance, requiring that every input element is mapped to exactly one output element). It seems better to instead switch return values to dicts, which can combined reliably with a straighforward restriction. Differential Revision: https://phab.mercurial-scm.org/D6581

File last commit:

r41263:b7448103 default
r42722:d29db0a0 default
Show More
dirstateguard.py
75 lines | 2.6 KiB | text/x-python | PythonLexer
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 # 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,
Martin von Zweigbergk
narrow: call narrowspec.{save,restore,clear}backup directly...
r38905 narrowspec,
Martin von Zweigbergk
util: add base class for transactional context managers...
r33790 util,
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 )
Martin von Zweigbergk
util: add base class for transactional context managers...
r33790 class dirstateguard(util.transactional):
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 '''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
Adam Simpkins
dirstate: update backup functions to take full backup filename...
r33440 self._backupname = 'dirstate.backup.%s.%d' % (name, id(self))
Martin von Zweigbergk
narrow: call narrowspec.{save,restore,clear}backup directly...
r38905 self._narrowspecbackupname = ('narrowspec.backup.%s.%d' %
(name, id(self)))
Adam Simpkins
dirstate: update backup functions to take full backup filename...
r33440 repo.dirstate.savebackup(repo.currenttransaction(), self._backupname)
Martin von Zweigbergk
narrow: make dirstateguard back up and restore working copy narrowspec instead...
r41263 narrowspec.savewcbackup(repo, self._narrowspecbackupname)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 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
Adam Simpkins
dirstate: update backup functions to take full backup filename...
r33440 msg = (_("can't close already inactivated backup: %s")
% self._backupname)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 raise error.Abort(msg)
self._repo.dirstate.clearbackup(self._repo.currenttransaction(),
Adam Simpkins
dirstate: update backup functions to take full backup filename...
r33440 self._backupname)
Martin von Zweigbergk
narrow: make dirstateguard back up and restore working copy narrowspec instead...
r41263 narrowspec.clearwcbackup(self._repo, self._narrowspecbackupname)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 self._active = False
self._closed = True
def _abort(self):
Martin von Zweigbergk
narrow: make dirstateguard back up and restore working copy narrowspec instead...
r41263 narrowspec.restorewcbackup(self._repo, self._narrowspecbackupname)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 self._repo.dirstate.restorebackup(self._repo.currenttransaction(),
Adam Simpkins
dirstate: update backup functions to take full backup filename...
r33440 self._backupname)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 self._active = False
def release(self):
if not self._closed:
if not self._active: # already inactivated
Adam Simpkins
dirstate: update backup functions to take full backup filename...
r33440 msg = (_("can't release already inactivated backup: %s")
% self._backupname)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 raise error.Abort(msg)
self._abort()