##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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.
Yuya Nishihara - - Load All Authors

File last commit:

r24200:8e1f1673 default
r24991:4169a4f8 default
Show More
graphlog.py
58 lines | 2.1 KiB | text/x-python | PythonLexer
/ hgext / graphlog.py
History | Source | Raw |Copy content |Copy permalink
Joel Rosdahl
Add graphlog extension
 r4344 # ASCII graph log extension for Mercurial
#
# Copyright 2007 Joel Rosdahl <joel@rosdahl.net>
Thomas Arendsen Hein
Removed trailing whitespace and tabs from python files
 r4516 #
Martin Geisler
updated license to be explicit about GPL version 2
 r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
 r10263 # GNU General Public License version 2 or any later version.
Martin Geisler
add blank line after copyright notices and after header
 r8228
Martin Geisler
graphlog: mark as deprecated
 r20118 '''command to view revision graphs from a shell (DEPRECATED)
The functionality of this extension has been include in core Mercurial
since version 2.3.
Alpar Juttner
Graphlog extension adds a --graph option to log/in/out...
 r7426
This extension adds a --graph option to the incoming, outgoing and log
Martin Geisler
graphlog: wrap docstrings at 70 characters
 r9259 commands. When this options is given, an ASCII representation of the
revision graph is also shown.
Alpar Juttner
Graphlog extension adds a --graph option to log/in/out...
 r7426 '''
Joel Rosdahl
Add graphlog extension
 r4344
from mercurial.i18n import _
Patrick Mezard
incoming/outgoing: handle --graph in core
 r17182 from mercurial import cmdutil, commands
Steve Borho
graphlog: add filelog revision grapher...
 r5938
Adrian Buehlmann
graphlog: use cmdutil.command decorator
 r14311 cmdtable = {}
command = cmdutil.command(cmdtable)
Augie Fackler
hgext: mark all first-party extensions as such
 r16743 testedwith = 'internal'
Adrian Buehlmann
graphlog: use cmdutil.command decorator
 r14311
@command('glog',
Patrick Mezard
graphlog: add all log options to glog command...
 r16432 [('f', 'follow', None,
_('follow changeset history, or file history across copies and renames')),
('', 'follow-first', None,
_('only follow the first parent of merge changesets (DEPRECATED)')),
('d', 'date', '', _('show revisions matching date spec'), _('DATE')),
('C', 'copies', None, _('show copied files')),
('k', 'keyword', [],
_('do case-insensitive search for a given text'), _('TEXT')),
Jordi Gutiérrez Hermoso
doc: change 'revision or range' to 'revision or revset'...
 r23091 ('r', 'rev', [], _('show the specified revision or revset'), _('REV')),
Patrick Mezard
graphlog: add all log options to glog command...
 r16432 ('', 'removed', None, _('include revisions where files were removed')),
('m', 'only-merges', None, _('show only merges (DEPRECATED)')),
('u', 'user', [], _('revisions committed by user'), _('USER')),
('', 'only-branch', [],
_('show only changesets within the given named branch (DEPRECATED)'),
_('BRANCH')),
('b', 'branch', [],
_('show changesets within the given named branch'), _('BRANCH')),
('P', 'prune', [],
_('do not display revision or any of its ancestors'), _('REV')),
] + commands.logopts + commands.walkopts,
Gregory Szorc
graphlog: define inferrepo in command decorator
 r21782 _('[OPTION]... [FILE]'),
inferrepo=True)
Alexander Solovyov
graphlog: make use of graphmod's revset support
 r14043 def graphlog(ui, repo, *pats, **opts):
Peter Arrenbrecht
graphlog: split the actual DAG grapher out into a separate method...
 r7325 """show revision history alongside an ASCII revision graph
Martin Geisler
graphlog: wrap docstrings at 70 characters
 r9259 Print a revision history alongside a revision graph drawn with
ASCII characters.
Peter Arrenbrecht
graphlog: split the actual DAG grapher out into a separate method...
 r7325
Martin Geisler
graphlog: wrap docstrings at 70 characters
 r9259 Nodes printed as an @ character are parents of the working
directory.
Peter Arrenbrecht
graphlog: split the actual DAG grapher out into a separate method...
 r7325 """
Yuya Nishihara
graphlog: do not bypass commands.log so that -fr works...
 r24200 opts['graph'] = True
return commands.log(ui, repo, *pats, **opts)