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

annotate mercurial/transaction.py @ 20882:5dffd06f1e50

transaction: add support for non-append files This adds support for normal, non-append-only files in transactions. For example, .hg/store/fncache and .hg/store/phaseroots should be written as part of the transaction, but are not append only files. This adds a journal.backupfiles along side the normal journal. This tracks which files have been backed up as part of the transaction. transaction.addbackup() creates a backup of the file (using a hardlink), which is later used to recover in the event of the transaction failing. Using a seperate journal allows the repository to still be used by older versions of Mercurial. A future patch will use this functionality and add tests for it.

author	Durham Goode <durham@fb.com>
date	Mon, 24 Mar 2014 15:21:51 -0700
parents	3c47677a8d04
children	203908968644

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 _
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	15 import errno, os
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
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	18 def active(func):
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	19 def _active(self, args, *kwds):
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	20 if self.count == 0:
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	21 raise error.Abort(_(
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	22 '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	23 return func(self, args, *kwds)
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	24 return _active
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	25
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	26 def _playback(journal, report, opener, entries, backupentries, unlink=True):
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	27 for f, o, ignore in entries:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	28 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	29 try:
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	30 fp = opener(f, 'a')
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	31 fp.truncate(o)
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	32 fp.close()
9686 ddf2adf88b89 transaction: more specific exceptions, os.unlink can raise OSError Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9220 diff changeset	33 except IOError:
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	34 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	35 raise
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	36 else:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	37 try:
20084 a3378a1b0a05 transaction: unlink target file via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17424 diff changeset	38 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	39 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	40 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	41 raise
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	42
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	43 backupfiles = []
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	44 for f, b, ignore in backupentries:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	45 filepath = opener.join(f)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	46 backuppath = opener.join(b)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	47 try:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	48 util.copyfile(backuppath, filepath)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	49 backupfiles.append(b)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	50 except IOError:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	51 report(_("failed to recover %s\n") % f)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	52 raise
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	53
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	54 opener.unlink(journal)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	55 backuppath = "%s.backupfiles" % journal
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	56 if opener.exists(backuppath):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	57 opener.unlink(backuppath)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	58 for f in backupfiles:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	59 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	60
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1541 diff changeset	61 class transaction(object):
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	62 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	63 onclose=None, onabort=None):
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	64 """Begin a new transaction
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	65
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	66 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	67 an exception.
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	68
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	69 * `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	70 * `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	71 * `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	72 closed
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	73 * `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	74 have been truncated
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	75 """
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	76 self.count = 1
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	77 self.usages = 1
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 573 diff changeset	78 self.report = report
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	79 self.opener = opener
95 589f507bb259 Beginnings of transaction undo support mpm@selenic.com parents: 43 diff changeset	80 self.after = after
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	81 self.onclose = onclose
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	82 self.onabort = onabort
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	83 self.entries = []
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	84 self.backupentries = []
42 91f1fa847158 Fix multiple changes to file per transaction mpm@selenic.com parents: 13 diff changeset	85 self.map = {}
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	86 self.backupmap = {}
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	87 self.journal = journal
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	88 self._queue = []
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	89
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	90 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	91 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	92 self.backupsfile = opener.open(self.backupjournal, 'w')
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	93 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	94 opener.chmod(self.journal, createmode & 0666)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	95 opener.chmod(self.backupjournal, createmode & 0666)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	96
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	97 def __del__(self):
558 0ceea19182a9 transaction: __del__ should do nothing if the journal already exists mpm@selenic.com parents: 515 diff changeset	98 if self.journal:
9693 c40a1ee20aa5 transaction: always remove empty journal on abort Sune Foldager <cryo@cyanite.org> parents: 9686 diff changeset	99 self._abort()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	100
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	101 @active
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	102 def startgroup(self):
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	103 self._queue.append(([], []))
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	104
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	105 @active
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	106 def endgroup(self):
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	107 q = self._queue.pop()
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	108 self.entries.extend(q[0])
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	109 self.backupentries.extend(q[1])
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	110
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	111 offsets = []
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	112 backups = []
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	113 for f, o, _ in q[0]:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	114 offsets.append((f, o))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	115
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	116 for f, b, _ in q[1]:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	117 backups.append((f, b))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	118
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	119 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	120 self.file.write(d)
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	121 self.file.flush()
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	122
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	123 d = ''.join(['%s\0%s\0' % (f, b) for f, b in backups])
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	124 self.backupsfile.write(d)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	125 self.backupsfile.flush()
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	126
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	127 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	128 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	129 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	130 return
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	131 if self._queue:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	132 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	133 return
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	134
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	135 self.entries.append((file, offset, data))
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	136 self.map[file] = len(self.entries) - 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	137 # 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	138 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	139 self.file.flush()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	140
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	141 @active
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	142 def addbackup(self, file, hardlink=True):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	143 """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	144
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	145 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	146 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	147 aborting.
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	148
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	149 * `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	150 * `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	151 """
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	152
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	153 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	154 return
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	155 backupfile = "journal.%s" % file
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	156 if self.opener.exists(file):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	157 filepath = self.opener.join(file)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	158 backuppath = self.opener.join(backupfile)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	159 util.copyfiles(filepath, backuppath, hardlink=hardlink)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	160 else:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	161 self.add(file, 0)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	162 return
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	163
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	164 if self._queue:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	165 self._queue[-1][1].append((file, backupfile))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	166 return
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	167
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	168 self.backupentries.append((file, backupfile, None))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	169 self.backupmap[file] = len(self.backupentries) - 1
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	170 self.backupsfile.write("%s\0%s\0" % (file, backupfile))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	171 self.backupsfile.flush()
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	172
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	173 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	174 def find(self, file):
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	175 if file in self.map:
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	176 return self.entries[self.map[file]]
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	177 if file in self.backupmap:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	178 return self.backupentries[self.backupmap[file]]
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	179 return None
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	180
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	181 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	182 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	183 '''
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	184 replace can only replace already committed entries
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	185 that are not pending in the queue
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	186 '''
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	187
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	188 if file not in self.map:
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	189 raise KeyError(file)
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	190 index = self.map[file]
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	191 self.entries[index] = (file, offset, data)
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	192 self.file.write("%s\0%d\n" % (file, offset))
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	193 self.file.flush()
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	194
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	195 @active
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	196 def nest(self):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	197 self.count += 1
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	198 self.usages += 1
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	199 return self
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	200
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	201 def release(self):
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	202 if self.count > 0:
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	203 self.usages -= 1
11685 aade8f133d11 cleanup: typos Patrick Mezard <pmezard@gmail.com> parents: 11230 diff changeset	204 # 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	205 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	206 self._abort()
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	207
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	208 def running(self):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	209 return self.count > 0
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	210
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	211 @active
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	212 def close(self):
9220 8a4da1388553 transaction: document close(), abort() methods Greg Ward <greg-hg@gerg.ca> parents: 9094 diff changeset	213 '''commit the transaction'''
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	214 if self.count == 1 and self.onclose is not None:
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	215 self.onclose()
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	216
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	217 self.count -= 1
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	218 if self.count != 0:
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	219 return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	220 self.file.close()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	221 self.entries = []
95 589f507bb259 Beginnings of transaction undo support mpm@selenic.com parents: 43 diff changeset	222 if self.after:
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 582 diff changeset	223 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	224 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	225 self.opener.unlink(self.journal)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	226 if self.opener.isfile(self.backupjournal):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	227 self.opener.unlink(self.backupjournal)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	228 for f, b, _ in self.backupentries:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	229 self.opener.unlink(b)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	230 self.backupentries = []
573 fbfbd4e506c3 transaction: nullify journal after close() mpm@selenic.com parents: 558 diff changeset	231 self.journal = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	232
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	233 @active
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	234 def abort(self):
9220 8a4da1388553 transaction: document close(), abort() methods Greg Ward <greg-hg@gerg.ca> parents: 9094 diff changeset	235 '''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	236 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	237 scope)'''
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	238 self._abort()
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	239
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	240 def _abort(self):
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	241 self.count = 0
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	242 self.usages = 0
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	243 self.file.close()
560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	244
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	245 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	246 self.onabort()
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	247
10228 056c366fea8c transaction: initialize self.journal to None after deletion Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9693 diff changeset	248 try:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	249 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	250 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	251 self.opener.unlink(self.journal)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	252 if self.backupjournal:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	253 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	254 return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	255
10228 056c366fea8c transaction: initialize self.journal to None after deletion Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9693 diff changeset	256 self.report(_("transaction abort!\n"))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	257
108 8d55c2d72c7c Warn if we fail to truncate something mpm@selenic.com parents: 95 diff changeset	258 try:
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10263 diff changeset	259 _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	260 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	261 self.report(_("rollback completed\n"))
16689 f366d4c2ff34 cleanup: replace naked excepts with except Exception: ... Brodie Rao <brodie@sf.io> parents: 13408 diff changeset	262 except Exception:
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	263 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	264 finally:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	265 self.journal = None
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	266
560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	267
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	268 def rollback(opener, file, report):
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	269 """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	270
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	271 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	272 '*.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	273
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	274 * `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	275 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	276 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	277 '*.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	278 pairs, delimited by \0.
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	279 """
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	280 entries = []
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	281 backupentries = []
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	282
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	283 fp = opener.open(file)
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	284 lines = fp.readlines()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	285 fp.close()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	286 for l in lines:
20524 28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	287 try:
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	288 f, o = l.split('\0')
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	289 entries.append((f, int(o), None))
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	290 except ValueError:
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	291 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	292
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	293 backupjournal = "%s.backupfiles" % file
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	294 if opener.exists(backupjournal):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	295 fp = opener.open(backupjournal)
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	296 data = fp.read()
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	297 if len(data) > 0:
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	298 parts = data.split('\0')
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	299 for i in xrange(0, len(parts), 2):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	300 f, b = parts[i:i + 1]
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	301 backupentries.append((f, b, None))
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	302
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	303 _playback(file, report, opener, entries, backupentries)

Mercurial > public > mercurial-scm > hg

annotate mercurial/transaction.py @ 20882:5dffd06f1e50