mercurial-scm/hg: mercurial/transaction.py annotate

annotate mercurial/transaction.py @ 23204:10beda5bd2b7

transaction: allow registering a finalization callback The new 'addfinalize' method allows people to register a callback to be triggered when the transaction is closed. This aims to get rid of explicit calls to 'changelog.finalize'. This also obsoletes the 'onclose' function but removing it is not in the scope of this series.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Fri, 17 Oct 2014 22:28:09 -0700
parents	ea5af863fbff
children	3f543f6be500

rev	line source
17424 e7cfe3587ea4 fix trivial spelling errors Mads Kiilerich <mads@kiilerich.com> parents: 16689 diff changeset	1 # transaction.py - simple journaling scheme for mercurial
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	3 # This transaction scheme is intended to gracefully handle program
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 # errors and interruptions. More serious failures like system crashes
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5 # can be recovered with an fsck-like tool. As the whole repository is
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	6 # effectively log-structured, this should amount to simply truncating
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7 # anything that isn't referenced in the changelog.
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	8 #
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2470 diff changeset	9 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	10 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8071 diff changeset	11 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 10228 diff changeset	12 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	13
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	14 from i18n import _
20886 203908968644 transaction: drop extra import caught by pyflakes Matt Mackall <mpm@selenic.com> parents: 20882 diff changeset	15 import errno
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	16 import error, util
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	17
23064 5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	18 version = 1
5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	19
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	20 def active(func):
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	21 def _active(self, args, *kwds):
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	22 if self.count == 0:
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	23 raise error.Abort(_(
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	24 'cannot use transaction when it is already committed/aborted'))
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	25 return func(self, args, *kwds)
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	26 return _active
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	27
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	28 def _playback(journal, report, opener, entries, backupentries, unlink=True):
22204 f8dc6599da5d cleanup: name unused variables using convention of leading _ Mads Kiilerich <madski@unity3d.com> parents: 22199 diff changeset	29 for f, o, _ignore in entries:
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	30 if o or not unlink:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	31 try:
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	32 fp = opener(f, 'a')
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	33 fp.truncate(o)
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	34 fp.close()
9686 ddf2adf88b89 transaction: more specific exceptions, os.unlink can raise OSError Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9220 diff changeset	35 except IOError:
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	36 report(_("failed to truncate %s\n") % f)
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	37 raise
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	38 else:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	39 try:
20084 a3378a1b0a05 transaction: unlink target file via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17424 diff changeset	40 opener.unlink(f)
9686 ddf2adf88b89 transaction: more specific exceptions, os.unlink can raise OSError Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9220 diff changeset	41 except (IOError, OSError), inst:
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	42 if inst.errno != errno.ENOENT:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	43 raise
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	44
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	45 backupfiles = []
22204 f8dc6599da5d cleanup: name unused variables using convention of leading _ Mads Kiilerich <madski@unity3d.com> parents: 22199 diff changeset	46 for f, b, _ignore in backupentries:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	47 filepath = opener.join(f)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	48 backuppath = opener.join(b)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	49 try:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	50 util.copyfile(backuppath, filepath)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	51 backupfiles.append(b)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	52 except IOError:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	53 report(_("failed to recover %s\n") % f)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	54 raise
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	55
20087 cf3b8285af00 transaction: take journal file path relative to vfs to use file API via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20084 diff changeset	56 opener.unlink(journal)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	57 backuppath = "%s.backupfiles" % journal
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	58 if opener.exists(backuppath):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	59 opener.unlink(backuppath)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	60 for f in backupfiles:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	61 opener.unlink(f)
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	62
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1541 diff changeset	63 class transaction(object):
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	64 def __init__(self, report, opener, journal, after=None, createmode=None,
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	65 onclose=None, onabort=None):
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	66 """Begin a new transaction
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	67
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	68 Begins a new transaction that allows rolling back writes in the event of
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	69 an exception.
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	70
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	71 * `after`: called after the transaction has been committed
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	72 * `createmode`: the mode of the journal file that will be created
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	73 * `onclose`: called as the transaction is closing, but before it is
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	74 closed
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	75 * `onabort`: called as the transaction is aborting, but before any files
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	76 have been truncated
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	77 """
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	78 self.count = 1
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	79 self.usages = 1
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 573 diff changeset	80 self.report = report
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	81 self.opener = opener
95 589f507bb259 Beginnings of transaction undo support mpm@selenic.com parents: 43 diff changeset	82 self.after = after
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	83 self.onclose = onclose
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	84 self.onabort = onabort
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	85 self.entries = []
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	86 self.backupentries = []
42 91f1fa847158 Fix multiple changes to file per transaction mpm@selenic.com parents: 13 diff changeset	87 self.map = {}
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	88 self.backupmap = {}
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	89 self.journal = journal
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	90 self._queue = []
21150 0d05915b688d transaction: add a notion of hook arguments Pierre-Yves David <pierre-yves.david@fb.com> parents: 20886 diff changeset	91 # a dict of arguments to be passed to hooks
0d05915b688d transaction: add a notion of hook arguments Pierre-Yves David <pierre-yves.david@fb.com> parents: 20886 diff changeset	92 self.hookargs = {}
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	93
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	94 self.backupjournal = "%s.backupfiles" % journal
20087 cf3b8285af00 transaction: take journal file path relative to vfs to use file API via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20084 diff changeset	95 self.file = opener.open(self.journal, "w")
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	96 self.backupsfile = opener.open(self.backupjournal, 'w')
23064 5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	97 self.backupsfile.write('%d\n' % version)
6065 53ed9b40cfc4 make the journal/undo files from transactions inherit the mode from .hg/store Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5865 diff changeset	98 if createmode is not None:
20087 cf3b8285af00 transaction: take journal file path relative to vfs to use file API via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20084 diff changeset	99 opener.chmod(self.journal, createmode & 0666)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	100 opener.chmod(self.backupjournal, createmode & 0666)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	101
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	102 # hold file generations to be performed on commit
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	103 self._filegenerators = {}
23202 ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	104 # hold callbalk to write pending data for hooks
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	105 self._pendingcallback = {}
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	106 # True is any pending data have been written ever
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	107 self._anypending = False
23204 10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	108 # holds callback to call when writing the transaction
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	109 self._finalizecallback = {}
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	110
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	111 def __del__(self):
558 0ceea19182a9 transaction: __del__ should do nothing if the journal already exists mpm@selenic.com parents: 515 diff changeset	112 if self.journal:
9693 c40a1ee20aa5 transaction: always remove empty journal on abort Sune Foldager <cryo@cyanite.org> parents: 9686 diff changeset	113 self._abort()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	114
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	115 @active
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	116 def startgroup(self):
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	117 self._queue.append(([], []))
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	118
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	119 @active
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	120 def endgroup(self):
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	121 q = self._queue.pop()
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	122 self.entries.extend(q[0])
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	123 self.backupentries.extend(q[1])
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	124
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	125 offsets = []
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	126 backups = []
22199 b3e51675f98e cleanup: avoid _ for local unused tmp variables - that is reserved for i18n Mads Kiilerich <madski@unity3d.com> parents: 22078 diff changeset	127 for f, o, _data in q[0]:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	128 offsets.append((f, o))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	129
22199 b3e51675f98e cleanup: avoid _ for local unused tmp variables - that is reserved for i18n Mads Kiilerich <madski@unity3d.com> parents: 22078 diff changeset	130 for f, b, _data in q[1]:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	131 backups.append((f, b))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	132
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	133 d = ''.join(['%s\0%d\n' % (f, o) for f, o in offsets])
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	134 self.file.write(d)
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	135 self.file.flush()
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	136
23065 963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	137 d = ''.join(['%s\0%s\n' % (f, b) for f, b in backups])
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	138 self.backupsfile.write(d)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	139 self.backupsfile.flush()
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	140
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	141 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	142 def add(self, file, offset, data=None):
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	143 if file in self.map or file in self.backupmap:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	144 return
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	145 if self._queue:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	146 self._queue[-1][0].append((file, offset, data))
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	147 return
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	148
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	149 self.entries.append((file, offset, data))
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	150 self.map[file] = len(self.entries) - 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	151 # add enough data to the journal to do the truncate
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	152 self.file.write("%s\0%d\n" % (file, offset))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	153 self.file.flush()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	154
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	155 @active
22663 4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	156 def addbackup(self, file, hardlink=True, vfs=None):
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	157 """Adds a backup of the file to the transaction
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	158
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	159 Calling addbackup() creates a hardlink backup of the specified file
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	160 that is used to recover the file in the event of the transaction
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	161 aborting.
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	162
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	163 * `file`: the file path, relative to .hg/store
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	164 * `hardlink`: use a hardlink to quickly create the backup
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	165 """
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	166
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	167 if file in self.map or file in self.backupmap:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	168 return
22077 2990ce46fc2d transaction: backup file in a dedicated "namespace" Pierre-Yves David <pierre-yves.david@fb.com> parents: 22076 diff changeset	169 backupfile = "%s.backup.%s" % (self.journal, file)
22663 4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	170 if vfs is None:
4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	171 vfs = self.opener
4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	172 if vfs.exists(file):
4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	173 filepath = vfs.join(file)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	174 backuppath = self.opener.join(backupfile)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	175 util.copyfiles(filepath, backuppath, hardlink=hardlink)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	176 else:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	177 self.add(file, 0)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	178 return
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	179
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	180 if self._queue:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	181 self._queue[-1][1].append((file, backupfile))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	182 return
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	183
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	184 self.backupentries.append((file, backupfile, None))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	185 self.backupmap[file] = len(self.backupentries) - 1
23065 963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	186 self.backupsfile.write("%s\0%s\n" % (file, backupfile))
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	187 self.backupsfile.flush()
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	188
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	189 @active
22663 4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	190 def addfilegenerator(self, genid, filenames, genfunc, order=0, vfs=None):
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	191 """add a function to generates some files at transaction commit
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	192
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	193 The `genfunc` argument is a function capable of generating proper
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	194 content of each entry in the `filename` tuple.
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	195
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	196 At transaction close time, `genfunc` will be called with one file
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	197 object argument per entries in `filenames`.
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	198
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	199 The transaction itself is responsible for the backup, creation and
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	200 final write of such file.
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	201
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	202 The `genid` argument is used to ensure the same set of file is only
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	203 generated once. Call to `addfilegenerator` for a `genid` already
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	204 present will overwrite the old entry.
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	205
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	206 The `order` argument may be used to control the order in which multiple
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	207 generator will be executed.
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	208 """
22663 4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	209 # For now, we are unable to do proper backup and restore of custom vfs
4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	210 # but for bookmarks that are handled outside this mechanism.
4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	211 assert vfs is None or filenames == ('bookmarks',)
4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	212 self._filegenerators[genid] = (order, filenames, genfunc, vfs)
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	213
23102 16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	214 def _generatefiles(self):
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	215 # write files registered for generation
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	216 for entry in sorted(self._filegenerators.values()):
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	217 order, filenames, genfunc, vfs = entry
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	218 if vfs is None:
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	219 vfs = self.opener
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	220 files = []
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	221 try:
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	222 for name in filenames:
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	223 # Some files are already backed up when creating the
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	224 # localrepo. Until this is properly fixed we disable the
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	225 # backup for them.
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	226 if name not in ('phaseroots', 'bookmarks'):
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	227 self.addbackup(name)
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	228 files.append(vfs(name, 'w', atomictemp=True))
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	229 genfunc(*files)
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	230 finally:
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	231 for f in files:
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	232 f.close()
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	233
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	234 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	235 def find(self, file):
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	236 if file in self.map:
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	237 return self.entries[self.map[file]]
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	238 if file in self.backupmap:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	239 return self.backupentries[self.backupmap[file]]
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	240 return None
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	241
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	242 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	243 def replace(self, file, offset, data=None):
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	244 '''
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	245 replace can only replace already committed entries
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	246 that are not pending in the queue
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	247 '''
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	248
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	249 if file not in self.map:
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	250 raise KeyError(file)
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	251 index = self.map[file]
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	252 self.entries[index] = (file, offset, data)
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	253 self.file.write("%s\0%d\n" % (file, offset))
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	254 self.file.flush()
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	255
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	256 @active
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	257 def nest(self):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	258 self.count += 1
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	259 self.usages += 1
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	260 return self
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	261
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	262 def release(self):
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	263 if self.count > 0:
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	264 self.usages -= 1
11685 aade8f133d11 cleanup: typos Patrick Mezard <pmezard@gmail.com> parents: 11230 diff changeset	265 # if the transaction scopes are left without being closed, fail
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	266 if self.count > 0 and self.usages == 0:
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	267 self._abort()
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	268
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	269 def running(self):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	270 return self.count > 0
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	271
23202 ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	272 def addpending(self, category, callback):
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	273 """add a callback to be called when the transaction is pending
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	274
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	275 Category is a unique identifier to allow overwriting an old callback
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	276 with a newer callback.
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	277 """
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	278 self._pendingcallback[category] = callback
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	279
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	280 @active
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	281 def writepending(self):
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	282 '''write pending file to temporary version
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	283
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	284 This is used to allow hooks to view a transaction before commit'''
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	285 categories = sorted(self._pendingcallback)
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	286 for cat in categories:
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	287 # remove callback since the data will have been flushed
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	288 any = self._pendingcallback.pop(cat)()
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	289 self._anypending = self._anypending or any
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	290 return self._anypending
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	291
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	292 @active
23204 10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	293 def addfinalize(self, category, callback):
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	294 """add a callback to be called when the transaction is closed
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	295
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	296 Category is a unique identifier to allow overwriting old callbacks with
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	297 newer callbacks.
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	298 """
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	299 self._finalizecallback[category] = callback
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	300
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	301 @active
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	302 def close(self):
9220 8a4da1388553 transaction: document close(), abort() methods Greg Ward <greg-hg@gerg.ca> parents: 9094 diff changeset	303 '''commit the transaction'''
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	304 if self.count == 1 and self.onclose is not None:
23103 29bfa964d6d8 transaction: only generate file when we actually close the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23102 diff changeset	305 self._generatefiles()
23204 10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	306 categories = sorted(self._finalizecallback)
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	307 for cat in categories:
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	308 self._finalizecallback[cat]()
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	309 self.onclose()
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	310
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	311 self.count -= 1
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	312 if self.count != 0:
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	313 return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	314 self.file.close()
21206 c77418938d05 transaction: fix file descriptor leak for journal.backupfiles Durham Goode <durham@fb.com> parents: 21150 diff changeset	315 self.backupsfile.close()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	316 self.entries = []
95 589f507bb259 Beginnings of transaction undo support mpm@selenic.com parents: 43 diff changeset	317 if self.after:
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 582 diff changeset	318 self.after()
20087 cf3b8285af00 transaction: take journal file path relative to vfs to use file API via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20084 diff changeset	319 if self.opener.isfile(self.journal):
cf3b8285af00 transaction: take journal file path relative to vfs to use file API via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20084 diff changeset	320 self.opener.unlink(self.journal)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	321 if self.opener.isfile(self.backupjournal):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	322 self.opener.unlink(self.backupjournal)
22204 f8dc6599da5d cleanup: name unused variables using convention of leading _ Mads Kiilerich <madski@unity3d.com> parents: 22199 diff changeset	323 for _f, b, _ignore in self.backupentries:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	324 self.opener.unlink(b)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	325 self.backupentries = []
573 fbfbd4e506c3 transaction: nullify journal after close() mpm@selenic.com parents: 558 diff changeset	326 self.journal = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	327
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	328 @active
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	329 def abort(self):
9220 8a4da1388553 transaction: document close(), abort() methods Greg Ward <greg-hg@gerg.ca> parents: 9094 diff changeset	330 '''abort the transaction (generally called on error, or when the
8a4da1388553 transaction: document close(), abort() methods Greg Ward <greg-hg@gerg.ca> parents: 9094 diff changeset	331 transaction is not explicitly committed before going out of
8a4da1388553 transaction: document close(), abort() methods Greg Ward <greg-hg@gerg.ca> parents: 9094 diff changeset	332 scope)'''
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	333 self._abort()
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	334
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	335 def _abort(self):
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	336 self.count = 0
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	337 self.usages = 0
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	338 self.file.close()
21206 c77418938d05 transaction: fix file descriptor leak for journal.backupfiles Durham Goode <durham@fb.com> parents: 21150 diff changeset	339 self.backupsfile.close()
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	340
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	341 if self.onabort is not None:
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	342 self.onabort()
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	343
10228 056c366fea8c transaction: initialize self.journal to None after deletion Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9693 diff changeset	344 try:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	345 if not self.entries and not self.backupentries:
10228 056c366fea8c transaction: initialize self.journal to None after deletion Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9693 diff changeset	346 if self.journal:
20087 cf3b8285af00 transaction: take journal file path relative to vfs to use file API via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20084 diff changeset	347 self.opener.unlink(self.journal)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	348 if self.backupjournal:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	349 self.opener.unlink(self.backupjournal)
10228 056c366fea8c transaction: initialize self.journal to None after deletion Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9693 diff changeset	350 return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	351
10228 056c366fea8c transaction: initialize self.journal to None after deletion Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9693 diff changeset	352 self.report(_("transaction abort!\n"))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	353
108 8d55c2d72c7c Warn if we fail to truncate something mpm@selenic.com parents: 95 diff changeset	354 try:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	355 _playback(self.journal, self.report, self.opener,
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	356 self.entries, self.backupentries, False)
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	357 self.report(_("rollback completed\n"))
16689 f366d4c2ff34 cleanup: replace naked excepts with except Exception: ... Brodie Rao <brodie@sf.io> parents: 13408 diff changeset	358 except Exception:
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	359 self.report(_("rollback failed - please run hg recover\n"))
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	360 finally:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	361 self.journal = None
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	362
560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	363
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	364 def rollback(opener, file, report):
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	365 """Rolls back the transaction contained in the given file
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	366
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	367 Reads the entries in the specified file, and the corresponding
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	368 '*.backupfiles' file, to recover from an incomplete transaction.
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	369
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	370 * `file`: a file containing a list of entries, specifying where
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	371 to truncate each file. The file should contain a list of
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	372 file\0offset pairs, delimited by newlines. The corresponding
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	373 '*.backupfiles' file should contain a list of file\0backupfile
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	374 pairs, delimited by \0.
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	375 """
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	376 entries = []
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	377 backupentries = []
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	378
20087 cf3b8285af00 transaction: take journal file path relative to vfs to use file API via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 20084 diff changeset	379 fp = opener.open(file)
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	380 lines = fp.readlines()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	381 fp.close()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	382 for l in lines:
20524 28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	383 try:
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	384 f, o = l.split('\0')
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	385 entries.append((f, int(o), None))
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	386 except ValueError:
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	387 report(_("couldn't read journal entry %r!\n") % l)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	388
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	389 backupjournal = "%s.backupfiles" % file
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	390 if opener.exists(backupjournal):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	391 fp = opener.open(backupjournal)
23065 963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	392 lines = fp.readlines()
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	393 if lines:
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	394 ver = lines[0][:-1]
23064 5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	395 if ver == str(version):
23065 963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	396 for line in lines[1:]:
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	397 if line:
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	398 # Shave off the trailing newline
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	399 line = line[:-1]
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	400 f, b = line.split('\0')
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	401 backupentries.append((f, b, None))
23064 5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	402 else:
5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	403 report(_("journal was created by a newer version of "
5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	404 "Mercurial"))
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	405
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	406 _playback(file, report, opener, entries, backupentries)

Mercurial > public > mercurial-scm > hg

annotate mercurial/transaction.py @ 23204:10beda5bd2b7