##// END OF EJS Templates
config: catch intended exception when failing to parse config...
config: catch intended exception when failing to parse config When a new config parser was introduced in fca54469480e (ui: introduce new config parser, 2009-04-23), the reading side would raise a ConfigError which was then caught in the ui code. Then, in 2123aad24d56 (error: add new ParseError for various parsing errors, 2010-06-04), a ParseError was raised instead, but the call site was not updated. Let's start catching that ParseError. We still don't print it in a friendly way, but that's not worse than before. Differential Revision: https://phab.mercurial-scm.org/D7625

File last commit:

r43347:687b865b default
r44361:dbaf9aab default
Show More
dirstateguard.py
84 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 )
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345
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
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._backupname = b'dirstate.backup.%s.%d' % (name, id(self))
self._narrowspecbackupname = b'narrowspec.backup.%s.%d' % (
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 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):
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 if self._active: # still active
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 # 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):
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 if not self._active: # already inactivated
msg = (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"can't close already inactivated backup: %s")
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 % self._backupname
)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 raise error.Abort(msg)
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 self._repo.dirstate.clearbackup(
self._repo.currenttransaction(), 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
style: run a patched black on a subset of mercurial...
r43345 self._repo.dirstate.restorebackup(
self._repo.currenttransaction(), 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:
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 if not self._active: # already inactivated
msg = (
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _(b"can't release already inactivated backup: %s")
Augie Fackler
style: run a patched black on a subset of mercurial...
r43345 % self._backupname
)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 raise error.Abort(msg)
self._abort()