##// END OF EJS Templates
graft: add no-commit mode (issue5631)...
graft: add no-commit mode (issue5631) This patch adds a new flag --no-commit in graft command. This feature grafts the changes but do not create commits for those changes, grafted changes will be added in the working directory. Also added tests to reflect the expected behavior. Differential Revision: https://phab.mercurial-scm.org/D2409

File last commit:

r33790:bbbbd3c3 default
r38492:622f79e3 default
Show More
dirstateguard.py
69 lines | 2.2 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
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))
repo.dirstate.savebackup(repo.currenttransaction(), self._backupname)
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)
Augie Fackler
dirstateguard: move to new module so I can break some layering violations...
r30488 self._active = False
self._closed = True
def _abort(self):
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()