##// END OF EJS Templates
scmutil: accept multiple predecessors in 'replacements' (API)...
scmutil: accept multiple predecessors in 'replacements' (API) This changeset makes 'cleanupnodes' accepts multiple predecessors as `replacements` keys. The same as it accepts multiple successors as `replacements` values. To avoid breaking all callers, the old and new ways are currently valid at the same time. We'll deprecate and drop the old way later. This change is the first step toward a better tracking of "fold" event in the evolution history. While working on the "rewind" command (in the evolve extension), we realized that first class tracking of folds are necessary. We already have good tracking of splits. When walking the evolution history from predecessors to successors, that makes for a clear distinction between having multiple successors because of the actual splitting of a changeset or content-divergences. The "rewind" command allows restoring older evolution of a stack of changesets. One of its mode walks the evolution history to automatically find appropriate predecessors. This means walking from successors to predecessors. In this case, we need to be able to make the same distinction between an actual fold and other cases. So we will have to track folds explicitly. This changesets only focus on making it possible to express fold at the `cleanupnodes` API level. The actual tracking will be implemented later.

File last commit:

r38905:ad24b581 default
r39927:b9990353 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: call narrowspec.{save,restore,clear}backup directly...
r38905 narrowspec.savebackup(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: call narrowspec.{save,restore,clear}backup directly...
r38905 narrowspec.clearbackup(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: call narrowspec.{save,restore,clear}backup directly...
r38905 narrowspec.restorebackup(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()