##// END OF EJS Templates
patch: stop handling hunkless git blocks out of stream...
patch: stop handling hunkless git blocks out of stream Patch changes are emitted by iterhunks() in two separate events: 'file' when hunks have to be applied and 'git' to describe other modifications like copies or mode changes. Note that a file which mode is changed and which content is modified by the same patch will be emitted in both events. It is more convenient to handle all file modifications in a single event. This patch "zips" git actions with regular changes so both kinds can be emitted at the same place.

File last commit:

r13408:19ad316e default
r14388:37c997d2 default
Show More
transaction.py
183 lines | 5.1 KiB | text/x-python | PythonLexer
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # transaction.py - simple journalling scheme for mercurial
#
# This transaction scheme is intended to gracefully handle program
# errors and interruptions. More serious failures like system crashes
# can be recovered with an fsck-like tool. As the whole repository is
# effectively log-structured, this should amount to simply truncating
# anything that isn't referenced in the changelog.
#
Vadim Gelfer
update copyrights.
r2859 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 #
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.
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
Matt Mackall
Simplify i18n imports
r3891 from i18n import _
Benoit Boissinot
add missing import from 618140c75d8d
r7335 import os, errno
Adrian Buehlmann
transaction: use posixfile and unlink from util...
r13408 import error, util
Henrik Stuart
transaction: ensure finished transactions are not reused...
r8289
def active(func):
def _active(self, *args, **kwds):
if self.count == 0:
raise error.Abort(_(
'cannot use transaction when it is already committed/aborted'))
return func(self, *args, **kwds)
return _active
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294 def _playback(journal, report, opener, entries, unlink=True):
for f, o, ignore in entries:
if o or not unlink:
try:
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 fp = opener(f, 'a')
fp.truncate(o)
fp.close()
Benoit Boissinot
transaction: more specific exceptions, os.unlink can raise OSError
r9686 except IOError:
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294 report(_("failed to truncate %s\n") % f)
raise
else:
try:
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 fp = opener(f)
fn = fp.name
fp.close()
Adrian Buehlmann
transaction: use posixfile and unlink from util...
r13408 util.unlink(fn)
Benoit Boissinot
transaction: more specific exceptions, os.unlink can raise OSError
r9686 except (IOError, OSError), inst:
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294 if inst.errno != errno.ENOENT:
raise
Adrian Buehlmann
transaction: use posixfile and unlink from util...
r13408 util.unlink(journal)
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294
Eric Hopper
Convert all classes to new-style classes by deriving them from object.
r1559 class transaction(object):
Alexis S. L. Carvalho
make the journal/undo files from transactions inherit the mode from .hg/store
r6065 def __init__(self, report, opener, journal, after=None, createmode=None):
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806 self.count = 1
Ronny Pfannschmidt
make transactions work on non-refcounted python implementations
r11230 self.usages = 1
mpm@selenic.com
Remove all remaining print statements...
r582 self.report = report
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 self.opener = opener
mpm@selenic.com
Beginnings of transaction undo support
r95 self.after = after
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 self.entries = []
mpm@selenic.com
Fix multiple changes to file per transaction
r42 self.map = {}
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 self.journal = journal
Henrik Stuart
transaction: add atomic groups to transaction logic...
r8363 self._queue = []
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
Adrian Buehlmann
transaction: use posixfile and unlink from util...
r13408 self.file = util.posixfile(self.journal, "w")
Alexis S. L. Carvalho
make the journal/undo files from transactions inherit the mode from .hg/store
r6065 if createmode is not None:
os.chmod(self.journal, createmode & 0666)
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
def __del__(self):
mpm@selenic.com
transaction: __del__ should do nothing if the journal already exists...
r558 if self.journal:
Sune Foldager
transaction: always remove empty journal on abort...
r9693 self._abort()
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
Henrik Stuart
transaction: ensure finished transactions are not reused...
r8289 @active
Henrik Stuart
transaction: add atomic groups to transaction logic...
r8363 def startgroup(self):
self._queue.append([])
@active
def endgroup(self):
q = self._queue.pop()
d = ''.join(['%s\0%d\n' % (x[0], x[1]) for x in q])
self.entries.extend(q)
self.file.write(d)
self.file.flush()
@active
Chris Mason
...
r2084 def add(self, file, offset, data=None):
Matt Mackall
many, many trivial check-code fixups
r10282 if file in self.map:
return
Henrik Stuart
transaction: add atomic groups to transaction logic...
r8363 if self._queue:
self._queue[-1].append((file, offset, data))
return
Chris Mason
...
r2084 self.entries.append((file, offset, data))
self.map[file] = len(self.entries) - 1
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 # add enough data to the journal to do the truncate
self.file.write("%s\0%d\n" % (file, offset))
self.file.flush()
Henrik Stuart
transaction: ensure finished transactions are not reused...
r8289 @active
Chris Mason
...
r2084 def find(self, file):
if file in self.map:
return self.entries[self.map[file]]
return None
Henrik Stuart
transaction: ensure finished transactions are not reused...
r8289 @active
Chris Mason
...
r2084 def replace(self, file, offset, data=None):
Henrik Stuart
transaction: add atomic groups to transaction logic...
r8363 '''
replace can only replace already committed entries
that are not pending in the queue
'''
Chris Mason
...
r2084 if file not in self.map:
raise KeyError(file)
index = self.map[file]
self.entries[index] = (file, offset, data)
self.file.write("%s\0%d\n" % (file, offset))
self.file.flush()
Henrik Stuart
transaction: ensure finished transactions are not reused...
r8289 @active
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806 def nest(self):
self.count += 1
Ronny Pfannschmidt
make transactions work on non-refcounted python implementations
r11230 self.usages += 1
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806 return self
Ronny Pfannschmidt
make transactions work on non-refcounted python implementations
r11230 def release(self):
if self.count > 0:
self.usages -= 1
Patrick Mezard
cleanup: typos
r11685 # if the transaction scopes are left without being closed, fail
Ronny Pfannschmidt
make transactions work on non-refcounted python implementations
r11230 if self.count > 0 and self.usages == 0:
self._abort()
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806 def running(self):
return self.count > 0
Henrik Stuart
transaction: ensure finished transactions are not reused...
r8289 @active
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def close(self):
Greg Ward
transaction: document close(), abort() methods
r9220 '''commit the transaction'''
mason@suse.com
Automatic nesting into running transactions in the same repository....
r1806 self.count -= 1
if self.count != 0:
return
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 self.file.close()
self.entries = []
mpm@selenic.com
Beginnings of transaction undo support
r95 if self.after:
mpm@selenic.com
Fix undo after aborted commit bug...
r785 self.after()
Sune Foldager
transaction: always remove empty journal on abort...
r9693 if os.path.isfile(self.journal):
Adrian Buehlmann
transaction: use posixfile and unlink from util...
r13408 util.unlink(self.journal)
mpm@selenic.com
transaction: nullify journal after close()...
r573 self.journal = None
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
Henrik Stuart
transaction: ensure finished transactions are not reused...
r8289 @active
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0 def abort(self):
Greg Ward
transaction: document close(), abort() methods
r9220 '''abort the transaction (generally called on error, or when the
transaction is not explicitly committed before going out of
scope)'''
Henrik Stuart
transaction: ensure finished transactions are not reused...
r8289 self._abort()
def _abort(self):
Henrik Stuart
transaction: reset transaction on abort...
r8290 self.count = 0
Ronny Pfannschmidt
make transactions work on non-refcounted python implementations
r11230 self.usages = 0
Henrik Stuart
transaction: reset transaction on abort...
r8290 self.file.close()
Benoit Boissinot
transaction: initialize self.journal to None after deletion...
r10228 try:
if not self.entries:
if self.journal:
Adrian Buehlmann
transaction: use posixfile and unlink from util...
r13408 util.unlink(self.journal)
Benoit Boissinot
transaction: initialize self.journal to None after deletion...
r10228 return
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
Benoit Boissinot
transaction: initialize self.journal to None after deletion...
r10228 self.report(_("transaction abort!\n"))
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
mpm@selenic.com
Warn if we fail to truncate something
r108 try:
Matt Mackall
many, many trivial check-code fixups
r10282 _playback(self.journal, self.report, self.opener,
self.entries, False)
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294 self.report(_("rollback completed\n"))
mpm@selenic.com
Warn if we fail to truncate something
r108 except:
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294 self.report(_("rollback failed - please run hg recover\n"))
finally:
self.journal = None
Henrik Stuart
transaction: reset transaction on abort...
r8290
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294 def rollback(opener, file, report):
entries = []
Adrian Buehlmann
transaction: use posixfile and unlink from util...
r13408 fp = util.posixfile(file)
Dan Villiom Podlaski Christiansen
explicitly close files...
r13400 lines = fp.readlines()
fp.close()
for l in lines:
mpm@selenic.com
Implement recover and undo commands...
r162 f, o = l.split('\0')
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294 entries.append((f, int(o), None))
mpm@selenic.com
Add back links from file revisions to changeset revisions...
r0
Henrik Stuart
transaction: refactor transaction.abort and rollback to use the same code...
r8294 _playback(file, report, opener, entries)