##// END OF EJS Templates
cmdutil: add class to restore dirstate during unexpected failure...
cmdutil: add class to restore dirstate during unexpected failure Before this patch, after "dirstate.write()" execution, there was no way to restore dirstate to the original status before "dirstate.write()". In some code paths, "dirstate.invalidate()" is used as a kind of "restore .hg/dirstate to the original status", but it just avoids writing changes in memory out, and doesn't actually restore the ".hg/dirstate" file. To fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hooks), "dirstate.write()" should be invoked before invocation of external processes. But at the same time, ".hg/dirstate" should be restored to its content before "dirstate.write()" during an unexpected failure in some cases. This patch adds the class "dirstateguard" to easily restore ".hg/dirstate" during unexpected failures. Typical usecase of it is: # (1) build dirstate up .... # (2) write dirstate out, and backup ".hg/dirstate" dsguard = dirstateguard(repo, 'scopename') try: # (3) execute somethig to do: # this may imply making some additional changes on dirstate .... # (4) unlink backed-up dirstate file at the end of dsguard scope dsguard.close() finally: # (5) if execution is aborted before "dsguard.close()", # ".hg/dirstate" is restored from the backup dsguard.release() For this kind of issue, an "extending transaction" approach (in https://titanpad.com/mercurial32-sprint) seems to not be suitable, because: - transaction nesting occurs in some cases (e.g. "shelve => rebase"), and - "dirstate" may be already modified since the beginning of OUTER transaction scope, then - dirstate should be backed up into the file other than "dirstate.journal" at the beginning of INNER transaction scope, but - such alternative backup files are useless for transaction itself, and increases complication of its implementation "transaction" and "dirstateguard" differ from each other also in "what it should do for .hg/dirstate" in cases other than success. ============== ======= ======== ============= type success fail "hg rollback" ============== ======= ======== ============= transaction keep keep restore dirstateguard keep restore (not implied) ============== ======= ======== ============= Some collaboration between transaction and dirstate will probably be introduced in the future. But this layer is needed in all cases.

File last commit:

r24306:6ddc86ee default
r24991:4169a4f8 default
Show More
dagutil.py
285 lines | 8.1 KiB | text/x-python | PythonLexer
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164 # dagutil.py - dag utilities for mercurial
#
# Copyright 2010 Benoit Boissinot <bboissin@gmail.com>
# and Peter Arrenbrecht <peter@arrenbrecht.ch>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from node import nullrev
Wagner Bruna
dagutil: fix missing import of i18n._
r14634 from i18n import _
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
class basedag(object):
'''generic interface for DAGs
terms:
"ix" (short for index) identifies a nodes internally,
"id" identifies one externally.
All params are ixs unless explicitly suffixed otherwise.
Pluralized params are lists or sets.
'''
def __init__(self):
self._inverse = None
def nodeset(self):
Mike Edgar
dagutil: fix id/ix typos in docstrings
r23216 '''set of all node ixs'''
Brodie Rao
cleanup: "raise SomeException()" -> "raise SomeException"
r16687 raise NotImplementedError
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
def heads(self):
'''list of head ixs'''
Brodie Rao
cleanup: "raise SomeException()" -> "raise SomeException"
r16687 raise NotImplementedError
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
def parents(self, ix):
'''list of parents ixs of ix'''
Brodie Rao
cleanup: "raise SomeException()" -> "raise SomeException"
r16687 raise NotImplementedError
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
def inverse(self):
'''inverse DAG, where parents becomes children, etc.'''
Brodie Rao
cleanup: "raise SomeException()" -> "raise SomeException"
r16687 raise NotImplementedError
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
def ancestorset(self, starts, stops=None):
Steven Brown
setdiscovery: limit lines to 80 characters
r14206 '''
set of all ancestors of starts (incl), but stop walk at stops (excl)
'''
Brodie Rao
cleanup: "raise SomeException()" -> "raise SomeException"
r16687 raise NotImplementedError
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
def descendantset(self, starts, stops=None):
Steven Brown
setdiscovery: limit lines to 80 characters
r14206 '''
set of all descendants of starts (incl), but stop walk at stops (excl)
'''
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164 return self.inverse().ancestorset(starts, stops)
def headsetofconnecteds(self, ixs):
Steven Brown
setdiscovery: limit lines to 80 characters
r14206 '''
subset of connected list of ixs so that no node has a descendant in it
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
By "connected list" we mean that if an ancestor and a descendant are in
Steven Brown
setdiscovery: limit lines to 80 characters
r14206 the list, then so is at least one path connecting them.
'''
Brodie Rao
cleanup: "raise SomeException()" -> "raise SomeException"
r16687 raise NotImplementedError
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
def externalize(self, ix):
Mads Kiilerich
dagutils: fix docstrings for singleton internalize/externalize
r22387 '''return a node id'''
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164 return self._externalize(ix)
def externalizeall(self, ixs):
'''return a list of (or set if given a set) of node ids'''
ids = self._externalizeall(ixs)
if isinstance(ixs, set):
return set(ids)
return list(ids)
def internalize(self, id):
Mads Kiilerich
dagutils: fix docstrings for singleton internalize/externalize
r22387 '''return a node ix'''
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164 return self._internalize(id)
def internalizeall(self, ids, filterunknown=False):
Mike Edgar
dagutil: fix id/ix typos in docstrings
r23216 '''return a list of (or set if given a set) of node ixs'''
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164 ixs = self._internalizeall(ids, filterunknown)
if isinstance(ids, set):
return set(ixs)
return list(ixs)
class genericdag(basedag):
'''generic implementations for DAGs'''
def ancestorset(self, starts, stops=None):
Jordi GutiƩrrez Hermoso
style: kill ersatz if-else ternary operators...
r24306 if stops:
stops = set(stops)
else:
stops = set()
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164 seen = set()
pending = list(starts)
while pending:
n = pending.pop()
if n not in seen and n not in stops:
seen.add(n)
pending.extend(self.parents(n))
return seen
def headsetofconnecteds(self, ixs):
hds = set(ixs)
if not hds:
return hds
for n in ixs:
for p in self.parents(n):
hds.discard(p)
assert hds
return hds
class revlogbaseddag(basedag):
'''generic dag interface to a revlog'''
def __init__(self, revlog, nodeset):
basedag.__init__(self)
self._revlog = revlog
self._heads = None
self._nodeset = nodeset
def nodeset(self):
return self._nodeset
def heads(self):
if self._heads is None:
self._heads = self._getheads()
return self._heads
def _externalize(self, ix):
return self._revlog.index[ix][7]
def _externalizeall(self, ixs):
idx = self._revlog.index
return [idx[i][7] for i in ixs]
def _internalize(self, id):
ix = self._revlog.rev(id)
if ix == nullrev:
raise LookupError(id, self._revlog.indexfile, _('nullid'))
return ix
def _internalizeall(self, ids, filterunknown):
rl = self._revlog
if filterunknown:
return [r for r in map(rl.nodemap.get, ids)
Pierre-Yves David
discovery: enforce filtering into revlogbaseddag._internalizeall...
r20224 if (r is not None
and r != nullrev
and r not in rl.filteredrevs)]
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164 return map(self._internalize, ids)
class revlogdag(revlogbaseddag):
'''dag interface to a revlog'''
def __init__(self, revlog):
Pierre-Yves David
discovery: make revlogdag work on filtered repo...
r20223 revlogbaseddag.__init__(self, revlog, set(revlog))
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
def _getheads(self):
return [r for r in self._revlog.headrevs() if r != nullrev]
def parents(self, ix):
rlog = self._revlog
idx = rlog.index
revdata = idx[ix]
prev = revdata[5]
if prev != nullrev:
prev2 = revdata[6]
if prev2 == nullrev:
return [prev]
return [prev, prev2]
prev2 = revdata[6]
if prev2 != nullrev:
return [prev2]
return []
def inverse(self):
if self._inverse is None:
self._inverse = inverserevlogdag(self)
return self._inverse
def ancestorset(self, starts, stops=None):
rlog = self._revlog
idx = rlog.index
Jordi GutiƩrrez Hermoso
style: kill ersatz if-else ternary operators...
r24306 if stops:
stops = set(stops)
else:
stops = set()
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164 seen = set()
pending = list(starts)
while pending:
rev = pending.pop()
if rev not in seen and rev not in stops:
seen.add(rev)
revdata = idx[rev]
for i in [5, 6]:
prev = revdata[i]
if prev != nullrev:
pending.append(prev)
return seen
def headsetofconnecteds(self, ixs):
if not ixs:
return set()
rlog = self._revlog
idx = rlog.index
headrevs = set(ixs)
for rev in ixs:
revdata = idx[rev]
for i in [5, 6]:
prev = revdata[i]
if prev != nullrev:
headrevs.discard(prev)
assert headrevs
return headrevs
Sune Foldager
revlogdag: add linearize function...
r14364 def linearize(self, ixs):
'''linearize and topologically sort a list of revisions
The linearization process tries to create long runs of revs where
a child rev comes immediately after its first parent. This is done by
visiting the heads of the given revs in inverse topological order,
and for each visited rev, visiting its second parent, then its first
parent, then adding the rev itself to the output list.
'''
sorted = []
visit = list(self.headsetofconnecteds(ixs))
visit.sort(reverse=True)
finished = set()
while visit:
cur = visit.pop()
if cur < 0:
cur = -cur - 1
if cur not in finished:
sorted.append(cur)
finished.add(cur)
else:
visit.append(-cur - 1)
visit += [p for p in self.parents(cur)
if p in ixs and p not in finished]
assert len(sorted) == len(ixs)
return sorted
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
class inverserevlogdag(revlogbaseddag, genericdag):
'''inverse of an existing revlog dag; see revlogdag.inverse()'''
def __init__(self, orig):
revlogbaseddag.__init__(self, orig._revlog, orig._nodeset)
self._orig = orig
self._children = {}
self._roots = []
self._walkfrom = len(self._revlog) - 1
def _walkto(self, walkto):
rev = self._walkfrom
cs = self._children
roots = self._roots
idx = self._revlog.index
while rev >= walkto:
data = idx[rev]
isroot = True
for prev in [data[5], data[6]]: # parent revs
if prev != nullrev:
cs.setdefault(prev, []).append(rev)
isroot = False
if isroot:
roots.append(rev)
rev -= 1
Peter Arrenbrecht
dagutil: fix off-by-one in inverserevlogdag buildup
r15052 self._walkfrom = rev
Peter Arrenbrecht
discovery: add new set-based discovery...
r14164
def _getheads(self):
self._walkto(nullrev)
return self._roots
def parents(self, ix):
if ix is None:
return []
if ix <= self._walkfrom:
self._walkto(ix)
return self._children.get(ix, [])
def inverse(self):
return self._orig