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

annotate mercurial/transaction.py @ 23903:426607be9c69

transaction: pass the name of the "undo" journal to the transaction It is time for the transaction to be responsible for setting up the undo data. It is necessary to move this logic into the transaction because many more files are handled now, and the transaction is the object tracking them all. The value can be set to None if no undo should be set.

author	Pierre-Yves David <pierre-yves.david@fb.com>
date	Fri, 16 Jan 2015 19:35:04 -0800
parents	13268fde4c4d
children	d251da5e0e84

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
23313 991098579940 transaction: set backupentries version to proper value Pierre-Yves David <pierre-yves.david@fb.com> parents: 23312 diff changeset	18 version = 2
23064 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
23311 64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	28 def _playback(journal, report, opener, vfsmap, entries, backupentries,
64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	29 unlink=True):
22204 f8dc6599da5d cleanup: name unused variables using convention of leading _ Mads Kiilerich <madski@unity3d.com> parents: 22199 diff changeset	30 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	31 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	32 try:
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	33 fp = opener(f, 'a')
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	34 fp.truncate(o)
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	35 fp.close()
9686 ddf2adf88b89 transaction: more specific exceptions, os.unlink can raise OSError Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9220 diff changeset	36 except IOError:
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	37 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	38 raise
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	39 else:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	40 try:
20084 a3378a1b0a05 transaction: unlink target file via vfs FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 17424 diff changeset	41 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	42 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	43 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	44 raise
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	45
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	46 backupfiles = []
23309 7eb520f5efe4 transaction: change the on disk format for backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23291 diff changeset	47 for l, f, b, c in backupentries:
23312 006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	48 if l not in vfsmap and c:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	49 report("couldn't handle %s: unknown cache location %s\n"
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	50 % (b, l))
23311 64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	51 vfs = vfsmap[l]
23312 006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	52 try:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	53 if f and b:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	54 filepath = vfs.join(f)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	55 backuppath = vfs.join(b)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	56 try:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	57 util.copyfile(backuppath, filepath)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	58 backupfiles.append(b)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	59 except IOError:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	60 report(_("failed to recover %s\n") % f)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	61 else:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	62 target = f or b
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	63 try:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	64 vfs.unlink(target)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	65 except (IOError, OSError), inst:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	66 if inst.errno != errno.ENOENT:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	67 raise
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	68 except (IOError, OSError, util.Abort), inst:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	69 if not c:
23278 aa19432764d6 transaction: handle missing file in backupentries (instead of using entries) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23253 diff changeset	70 raise
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	71
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	72 opener.unlink(journal)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	73 backuppath = "%s.backupfiles" % journal
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	74 if opener.exists(backuppath):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	75 opener.unlink(backuppath)
23312 006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	76 try:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	77 for f in backupfiles:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	78 if opener.exists(f):
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	79 opener.unlink(f)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	80 except (IOError, OSError, util.Abort), inst:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	81 # only pure backup file remains, it is sage to ignore any error
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	82 pass
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	83
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1541 diff changeset	84 class transaction(object):
23903 426607be9c69 transaction: pass the name of the "undo" journal to the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23901 diff changeset	85 def __init__(self, report, opener, vfsmap, journalname, undoname=None,
426607be9c69 transaction: pass the name of the "undo" journal to the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23901 diff changeset	86 after=None, createmode=None):
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	87 """Begin a new transaction
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	88
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	89 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	90 an exception.
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	91
3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	92 * `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	93 * `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	94 """
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	95 self.count = 1
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	96 self.usages = 1
582 df8a5a0098d4 Remove all remaining print statements mpm@selenic.com parents: 573 diff changeset	97 self.report = report
23310 5bd1f6572db0 transaction: pass a vfs map to the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23309 diff changeset	98 # a vfs to the store content
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	99 self.opener = opener
23310 5bd1f6572db0 transaction: pass a vfs map to the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23309 diff changeset	100 # a map to access file in various {location -> vfs}
5bd1f6572db0 transaction: pass a vfs map to the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23309 diff changeset	101 vfsmap = vfsmap.copy()
5bd1f6572db0 transaction: pass a vfs map to the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23309 diff changeset	102 vfsmap[''] = opener # set default value
5bd1f6572db0 transaction: pass a vfs map to the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23309 diff changeset	103 self._vfsmap = vfsmap
95 589f507bb259 Beginnings of transaction undo support mpm@selenic.com parents: 43 diff changeset	104 self.after = after
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	105 self.entries = []
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	106 self.map = {}
23901 13268fde4c4d transaction: clarify the name of 'journal' argument for transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23900 diff changeset	107 self.journal = journalname
23903 426607be9c69 transaction: pass the name of the "undo" journal to the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23901 diff changeset	108 self.undoname = undoname
23279 e245775f8fd3 transaction: gather backupjournal logic together in the __init__ Pierre-Yves David <pierre-yves.david@fb.com> parents: 23278 diff changeset	109 self._queue = []
e245775f8fd3 transaction: gather backupjournal logic together in the __init__ Pierre-Yves David <pierre-yves.david@fb.com> parents: 23278 diff changeset	110 # a dict of arguments to be passed to hooks
e245775f8fd3 transaction: gather backupjournal logic together in the __init__ Pierre-Yves David <pierre-yves.david@fb.com> parents: 23278 diff changeset	111 self.hookargs = {}
e245775f8fd3 transaction: gather backupjournal logic together in the __init__ Pierre-Yves David <pierre-yves.david@fb.com> parents: 23278 diff changeset	112 self.file = opener.open(self.journal, "w")
e245775f8fd3 transaction: gather backupjournal logic together in the __init__ Pierre-Yves David <pierre-yves.david@fb.com> parents: 23278 diff changeset	113
23309 7eb520f5efe4 transaction: change the on disk format for backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23291 diff changeset	114 # a list of ('location', 'path', 'backuppath', cache) entries.
23311 64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	115 # - if 'backuppath' is empty, no file existed at backup time
64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	116 # - if 'path' is empty, this is a temporary transaction file
64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	117 # - if 'location' is not empty, the path is outside main opener reach.
64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	118 # use 'location' value as a key in a vfsmap to find the right 'vfs'
64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	119 # (cache is currently unused)
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	120 self._backupentries = []
84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	121 self._backupmap = {}
23901 13268fde4c4d transaction: clarify the name of 'journal' argument for transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23900 diff changeset	122 self._backupjournal = "%s.backupfiles" % self.journal
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	123 self._backupsfile = opener.open(self._backupjournal, 'w')
84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	124 self._backupsfile.write('%d\n' % version)
23279 e245775f8fd3 transaction: gather backupjournal logic together in the __init__ Pierre-Yves David <pierre-yves.david@fb.com> parents: 23278 diff changeset	125
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	126 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	127 opener.chmod(self.journal, createmode & 0666)
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	128 opener.chmod(self._backupjournal, createmode & 0666)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	129
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	130 # 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	131 self._filegenerators = {}
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23513 diff changeset	132 # hold callback to write pending data for hooks
23202 ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	133 self._pendingcallback = {}
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	134 # 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	135 self._anypending = False
23204 10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	136 # 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	137 self._finalizecallback = {}
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23513 diff changeset	138 # hold callback for post transaction close
23220 3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	139 self._postclosecallback = {}
23764 d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	140 # holds callbacks to call during abort
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	141 self._abortcallback = {}
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	142
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	143 def __del__(self):
558 0ceea19182a9 transaction: __del__ should do nothing if the journal already exists mpm@selenic.com parents: 515 diff changeset	144 if self.journal:
9693 c40a1ee20aa5 transaction: always remove empty journal on abort Sune Foldager <cryo@cyanite.org> parents: 9686 diff changeset	145 self._abort()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	146
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	147 @active
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	148 def startgroup(self):
23250 8919dc7f2dbb transaction: document startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23249 diff changeset	149 """delay registration of file entry
8919dc7f2dbb transaction: document startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23249 diff changeset	150
8919dc7f2dbb transaction: document startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23249 diff changeset	151 This is used by strip to delay vision of strip offset. The transaction
8919dc7f2dbb transaction: document startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23249 diff changeset	152 sees either none or all of the strip actions to be done."""
23251 85c634ff395a transaction: drop backupentries logic from startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23250 diff changeset	153 self._queue.append([])
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	154
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	155 @active
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	156 def endgroup(self):
23250 8919dc7f2dbb transaction: document startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23249 diff changeset	157 """apply delayed registration of file entry.
8919dc7f2dbb transaction: document startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23249 diff changeset	158
8919dc7f2dbb transaction: document startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23249 diff changeset	159 This is used by strip to delay vision of strip offset. The transaction
8919dc7f2dbb transaction: document startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23249 diff changeset	160 sees either none or all of the strip actions to be done."""
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	161 q = self._queue.pop()
23253 8d84b7a2dd91 transaction: factorise append-only file registration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23252 diff changeset	162 for f, o, data in q:
8d84b7a2dd91 transaction: factorise append-only file registration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23252 diff changeset	163 self._addentry(f, o, data)
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	164
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	165 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	166 def add(self, file, offset, data=None):
23252 70809438c644 transaction: document `tr.add` Pierre-Yves David <pierre-yves.david@fb.com> parents: 23251 diff changeset	167 """record the state of an append-only file before update"""
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	168 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	169 return
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	170 if self._queue:
23251 85c634ff395a transaction: drop backupentries logic from startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23250 diff changeset	171 self._queue[-1].append((file, offset, data))
8363 c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	172 return
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	173
23253 8d84b7a2dd91 transaction: factorise append-only file registration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23252 diff changeset	174 self._addentry(file, offset, data)
8d84b7a2dd91 transaction: factorise append-only file registration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23252 diff changeset	175
8d84b7a2dd91 transaction: factorise append-only file registration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23252 diff changeset	176 def _addentry(self, file, offset, data):
8d84b7a2dd91 transaction: factorise append-only file registration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23252 diff changeset	177 """add a append-only entry to memory and on-disk state"""
8d84b7a2dd91 transaction: factorise append-only file registration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23252 diff changeset	178 if file in self.map or file in self._backupmap:
8d84b7a2dd91 transaction: factorise append-only file registration Pierre-Yves David <pierre-yves.david@fb.com> parents: 23252 diff changeset	179 return
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	180 self.entries.append((file, offset, data))
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	181 self.map[file] = len(self.entries) - 1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	182 # 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	183 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	184 self.file.flush()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	185
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	186 @active
23316 fc3670f41d3e transaction: use 'location' instead of 'vfs' in the addbackup method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23315 diff changeset	187 def addbackup(self, file, hardlink=True, location=''):
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	188 """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	189
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	190 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	191 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	192 aborting.
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	193
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	194 * `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	195 * `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	196 """
23251 85c634ff395a transaction: drop backupentries logic from startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23250 diff changeset	197 if self._queue:
85c634ff395a transaction: drop backupentries logic from startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23250 diff changeset	198 msg = 'cannot use transaction.addbackup inside "group"'
85c634ff395a transaction: drop backupentries logic from startgroup and endgroup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23250 diff changeset	199 raise RuntimeError(msg)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	200
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	201 if file in self.map or file in self._backupmap:
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	202 return
23582 7559dc8c4238 vfs: add a 'split' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23581 diff changeset	203 vfs = self._vfsmap[location]
7559dc8c4238 vfs: add a 'split' method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23581 diff changeset	204 dirname, filename = vfs.split(file)
23315 66275ecc73c1 addbackup: handle file in subdirectory Pierre-Yves David <pierre-yves.david@fb.com> parents: 23314 diff changeset	205 backupfilename = "%s.backup.%s" % (self.journal, filename)
23581 aed981c7bebf vfs: add a 'reljoin' function for joining relative paths Pierre-Yves David <pierre-yves.david@fb.com> parents: 23543 diff changeset	206 backupfile = vfs.reljoin(dirname, backupfilename)
22663 4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	207 if vfs.exists(file):
4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	208 filepath = vfs.join(file)
23314 43f66ae57a66 addbackup: use the vfs for the backup destination too Pierre-Yves David <pierre-yves.david@fb.com> parents: 23313 diff changeset	209 backuppath = vfs.join(backupfile)
23900 5eb3541f907e transaction: use 'util.copyfile' for creating backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23764 diff changeset	210 util.copyfile(filepath, backuppath, hardlink=hardlink)
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	211 else:
23278 aa19432764d6 transaction: handle missing file in backupentries (instead of using entries) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23253 diff changeset	212 backupfile = ''
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	213
23316 fc3670f41d3e transaction: use 'location' instead of 'vfs' in the addbackup method Pierre-Yves David <pierre-yves.david@fb.com> parents: 23315 diff changeset	214 self._addbackupentry((location, file, backupfile, False))
23283 b04263c38a92 transaction: extract backupentry registration in a dedicated function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23282 diff changeset	215
b04263c38a92 transaction: extract backupentry registration in a dedicated function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23282 diff changeset	216 def _addbackupentry(self, entry):
b04263c38a92 transaction: extract backupentry registration in a dedicated function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23282 diff changeset	217 """register a new backup entry and write it to disk"""
b04263c38a92 transaction: extract backupentry registration in a dedicated function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23282 diff changeset	218 self._backupentries.append(entry)
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	219 self._backupmap[file] = len(self._backupentries) - 1
23309 7eb520f5efe4 transaction: change the on disk format for backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23291 diff changeset	220 self._backupsfile.write("%s\0%s\0%s\0%d\n" % entry)
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	221 self._backupsfile.flush()
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	222
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	223 @active
23354 918c77775df6 transaction: accept a 'location' argument for registertmp Pierre-Yves David <pierre-yves.david@fb.com> parents: 23318 diff changeset	224 def registertmp(self, tmpfile, location=''):
23291 03d2d6931836 transaction: allow registering a temporary transaction file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23290 diff changeset	225 """register a temporary transaction file
03d2d6931836 transaction: allow registering a temporary transaction file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23290 diff changeset	226
23355 7faa55c20b0e transaction: fix some docstring grammar Matt Mackall <mpm@selenic.com> parents: 23354 diff changeset	227 Such files will be deleted when the transaction exits (on both
7faa55c20b0e transaction: fix some docstring grammar Matt Mackall <mpm@selenic.com> parents: 23354 diff changeset	228 failure and success).
23291 03d2d6931836 transaction: allow registering a temporary transaction file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23290 diff changeset	229 """
23354 918c77775df6 transaction: accept a 'location' argument for registertmp Pierre-Yves David <pierre-yves.david@fb.com> parents: 23318 diff changeset	230 self._addbackupentry((location, '', tmpfile, False))
23291 03d2d6931836 transaction: allow registering a temporary transaction file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23290 diff changeset	231
03d2d6931836 transaction: allow registering a temporary transaction file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23290 diff changeset	232 @active
23317 197e17be5407 transaction: use 'location' instead of 'vfs' objects for file generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 23316 diff changeset	233 def addfilegenerator(self, genid, filenames, genfunc, order=0,
197e17be5407 transaction: use 'location' instead of 'vfs' objects for file generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 23316 diff changeset	234 location=''):
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	235 """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	236
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	237 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	238 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	239
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	240 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	241 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	242
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	243 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	244 final write of such file.
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	245
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	246 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	247 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	248 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	249
feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	250 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	251 generator will be executed.
23317 197e17be5407 transaction: use 'location' instead of 'vfs' objects for file generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 23316 diff changeset	252
197e17be5407 transaction: use 'location' instead of 'vfs' objects for file generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 23316 diff changeset	253 The `location` arguments may be used to indicate the files are located
197e17be5407 transaction: use 'location' instead of 'vfs' objects for file generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 23316 diff changeset	254 outside of the the standard directory for transaction. It should match
23543 4dd8a6a1240d spelling: fixes from proofreading of spell checker issues Mads Kiilerich <madski@unity3d.com> parents: 23513 diff changeset	255 one of the key of the `transaction.vfsmap` dictionary.
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	256 """
22663 4c6198737ad8 transaction: allow generating file outside of store Pierre-Yves David <pierre-yves.david@fb.com> parents: 22662 diff changeset	257 # 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	258 # but for bookmarks that are handled outside this mechanism.
23317 197e17be5407 transaction: use 'location' instead of 'vfs' objects for file generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 23316 diff changeset	259 self._filegenerators[genid] = (order, filenames, genfunc, location)
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	260
23356 140c21fbf4eb transaction: allow generating files with a suffix Pierre-Yves David <pierre-yves.david@fb.com> parents: 23355 diff changeset	261 def _generatefiles(self, suffix=''):
23102 16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	262 # write files registered for generation
23357 ba033f461f00 transaction: have _generatefile return a boolean Pierre-Yves David <pierre-yves.david@fb.com> parents: 23356 diff changeset	263 any = False
23102 16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	264 for entry in sorted(self._filegenerators.values()):
23357 ba033f461f00 transaction: have _generatefile return a boolean Pierre-Yves David <pierre-yves.david@fb.com> parents: 23356 diff changeset	265 any = True
23317 197e17be5407 transaction: use 'location' instead of 'vfs' objects for file generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 23316 diff changeset	266 order, filenames, genfunc, location = entry
197e17be5407 transaction: use 'location' instead of 'vfs' objects for file generation Pierre-Yves David <pierre-yves.david@fb.com> parents: 23316 diff changeset	267 vfs = self._vfsmap[location]
23102 16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	268 files = []
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	269 try:
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	270 for name in filenames:
23356 140c21fbf4eb transaction: allow generating files with a suffix Pierre-Yves David <pierre-yves.david@fb.com> parents: 23355 diff changeset	271 name += suffix
140c21fbf4eb transaction: allow generating files with a suffix Pierre-Yves David <pierre-yves.david@fb.com> parents: 23355 diff changeset	272 if suffix:
140c21fbf4eb transaction: allow generating files with a suffix Pierre-Yves David <pierre-yves.david@fb.com> parents: 23355 diff changeset	273 self.registertmp(name, location=location)
140c21fbf4eb transaction: allow generating files with a suffix Pierre-Yves David <pierre-yves.david@fb.com> parents: 23355 diff changeset	274 else:
140c21fbf4eb transaction: allow generating files with a suffix Pierre-Yves David <pierre-yves.david@fb.com> parents: 23355 diff changeset	275 self.addbackup(name, location=location)
23102 16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	276 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	277 genfunc(*files)
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	278 finally:
16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	279 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	280 f.close()
23357 ba033f461f00 transaction: have _generatefile return a boolean Pierre-Yves David <pierre-yves.david@fb.com> parents: 23356 diff changeset	281 return any
23102 16da812ad970 transaction: extract file generation into its own function Pierre-Yves David <pierre-yves.david@fb.com> parents: 23065 diff changeset	282
22078 feb4797c676e transaction: add a file generation mechanism Pierre-Yves David <pierre-yves.david@fb.com> parents: 22077 diff changeset	283 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	284 def find(self, file):
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	285 if file in self.map:
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	286 return self.entries[self.map[file]]
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	287 if file in self._backupmap:
84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	288 return self._backupentries[self._backupmap[file]]
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	289 return None
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	290
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	291 @active
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	292 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	293 '''
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	294 replace can only replace already committed entries
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	295 that are not pending in the queue
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	296 '''
c8e81f557da7 transaction: add atomic groups to transaction logic Henrik Stuart <hg@hstuart.dk> parents: 8294 diff changeset	297
2084 d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	298 if file not in self.map:
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	299 raise KeyError(file)
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	300 index = self.map[file]
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	301 self.entries[index] = (file, offset, data)
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	302 self.file.write("%s\0%d\n" % (file, offset))
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	303 self.file.flush()
d66278012853 Chris Mason <mason@suse.com> parents: 1806 diff changeset	304
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	305 @active
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	306 def nest(self):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	307 self.count += 1
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	308 self.usages += 1
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	309 return self
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	310
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	311 def release(self):
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	312 if self.count > 0:
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	313 self.usages -= 1
11685 aade8f133d11 cleanup: typos Patrick Mezard <pmezard@gmail.com> parents: 11230 diff changeset	314 # 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	315 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	316 self._abort()
5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	317
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	318 def running(self):
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	319 return self.count > 0
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	320
23202 ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	321 def addpending(self, category, callback):
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	322 """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	323
23280 b01c491af0cf transaction: pass the transaction to 'pending' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23279 diff changeset	324 The transaction will be given as callback's first argument.
b01c491af0cf transaction: pass the transaction to 'pending' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23279 diff changeset	325
23202 ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	326 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	327 with a newer callback.
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	328 """
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	329 self._pendingcallback[category] = callback
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	330
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	331 @active
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	332 def writepending(self):
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	333 '''write pending file to temporary version
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	334
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	335 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	336 categories = sorted(self._pendingcallback)
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	337 for cat in categories:
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	338 # remove callback since the data will have been flushed
23280 b01c491af0cf transaction: pass the transaction to 'pending' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23279 diff changeset	339 any = self._pendingcallback.pop(cat)(self)
23202 ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	340 self._anypending = self._anypending or any
23358 1b51d1b05482 transaction: write pending generated files Pierre-Yves David <pierre-yves.david@fb.com> parents: 23357 diff changeset	341 self._anypending \|= self._generatefiles(suffix='.pending')
23202 ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	342 return self._anypending
ea5af863fbff transaction: add 'writepending' logic Pierre-Yves David <pierre-yves.david@fb.com> parents: 23103 diff changeset	343
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	344 @active
23204 10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	345 def addfinalize(self, category, callback):
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	346 """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	347
23281 f60ed8cf4afc transaction: pass the transaction to 'finalize' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23280 diff changeset	348 The transaction will be given as callback's first argument.
f60ed8cf4afc transaction: pass the transaction to 'finalize' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23280 diff changeset	349
23204 10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	350 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	351 newer callbacks.
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	352 """
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	353 self._finalizecallback[category] = callback
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	354
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	355 @active
23220 3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	356 def addpostclose(self, category, callback):
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	357 """add a callback to be called after the transaction is closed
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	358
23282 6c1351352b6c transaction: pass the transaction to 'postclose' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23281 diff changeset	359 The transaction will be given as callback's first argument.
6c1351352b6c transaction: pass the transaction to 'postclose' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23281 diff changeset	360
23220 3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	361 Category is a unique identifier to allow overwriting an old callback
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	362 with a newer callback.
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	363 """
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	364 self._postclosecallback[category] = callback
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	365
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	366 @active
23764 d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	367 def addabort(self, category, callback):
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	368 """add a callback to be called when the transaction is aborted.
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	369
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	370 The transaction will be given as the first argument to the callback.
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	371
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	372 Category is a unique identifier to allow overwriting an old callback
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	373 with a newer callback.
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	374 """
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	375 self._abortcallback[category] = callback
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	376
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	377 @active
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	378 def close(self):
9220 8a4da1388553 transaction: document close(), abort() methods Greg Ward <greg-hg@gerg.ca> parents: 9094 diff changeset	379 '''commit the transaction'''
23290 59513ec76748 transaction: always generate file on close Pierre-Yves David <pierre-yves.david@fb.com> parents: 23283 diff changeset	380 if self.count == 1:
23103 29bfa964d6d8 transaction: only generate file when we actually close the transaction Pierre-Yves David <pierre-yves.david@fb.com> parents: 23102 diff changeset	381 self._generatefiles()
23204 10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	382 categories = sorted(self._finalizecallback)
10beda5bd2b7 transaction: allow registering a finalization callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23202 diff changeset	383 for cat in categories:
23281 f60ed8cf4afc transaction: pass the transaction to 'finalize' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23280 diff changeset	384 self._finalizecallback[cat](self)
20881 3c47677a8d04 transaction: add onclose/onabort hook for pre-close logic Durham Goode <durham@fb.com> parents: 20524 diff changeset	385
1806 a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	386 self.count -= 1
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	387 if self.count != 0:
a2c69737e65e Automatic nesting into running transactions in the same repository. mason@suse.com parents: 1559 diff changeset	388 return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	389 self.file.close()
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	390 self._backupsfile.close()
23291 03d2d6931836 transaction: allow registering a temporary transaction file Pierre-Yves David <pierre-yves.david@fb.com> parents: 23290 diff changeset	391 # cleanup temporary files
23312 006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	392 for l, f, b, c in self._backupentries:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	393 if l not in self._vfsmap and c:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	394 self.report("couldn't remote %s: unknown cache location %s\n"
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	395 % (b, l))
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	396 continue
23311 64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	397 vfs = self._vfsmap[l]
64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	398 if not f and b and vfs.exists(b):
23312 006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	399 try:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	400 vfs.unlink(b)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	401 except (IOError, OSError, util.Abort), inst:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	402 if not c:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	403 raise
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	404 # Abort may be raise by read only opener
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	405 self.report("couldn't remote %s: %s\n"
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	406 % (vfs.join(b), inst))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	407 self.entries = []
95 589f507bb259 Beginnings of transaction undo support mpm@selenic.com parents: 43 diff changeset	408 if self.after:
785 46a8dd3145cc Fix undo after aborted commit bug mpm@selenic.com parents: 582 diff changeset	409 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	410 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	411 self.opener.unlink(self.journal)
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	412 if self.opener.isfile(self._backupjournal):
84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	413 self.opener.unlink(self._backupjournal)
23727 987ef74d8d01 transaction: use the right location when cleaning up backup file (issue4479) Pierre-Yves David <pierre-yves.david@fb.com> parents: 23582 diff changeset	414 for l, _f, b, c in self._backupentries:
23312 006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	415 if l not in self._vfsmap and c:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	416 self.report("couldn't remote %s: unknown cache location"
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	417 "%s\n" % (b, l))
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	418 continue
23311 64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	419 vfs = self._vfsmap[l]
64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	420 if b and vfs.exists(b):
23312 006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	421 try:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	422 vfs.unlink(b)
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	423 except (IOError, OSError, util.Abort), inst:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	424 if not c:
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	425 raise
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	426 # Abort may be raise by read only opener
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	427 self.report("couldn't remote %s: %s\n"
006e9ef05c31 transaction: support cache file in backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23311 diff changeset	428 % (vfs.join(b), inst))
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	429 self._backupentries = []
573 fbfbd4e506c3 transaction: nullify journal after close() mpm@selenic.com parents: 558 diff changeset	430 self.journal = None
23220 3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	431 # run post close action
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	432 categories = sorted(self._postclosecallback)
3f543f6be500 transaction: allow registering a post-close callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23204 diff changeset	433 for cat in categories:
23282 6c1351352b6c transaction: pass the transaction to 'postclose' callback Pierre-Yves David <pierre-yves.david@fb.com> parents: 23281 diff changeset	434 self._postclosecallback[cat](self)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	435
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	436 @active
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	437 def abort(self):
9220 8a4da1388553 transaction: document close(), abort() methods Greg Ward <greg-hg@gerg.ca> parents: 9094 diff changeset	438 '''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	439 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	440 scope)'''
8289 fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	441 self._abort()
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	442
fe8a3e56039f transaction: ensure finished transactions are not reused Henrik Stuart <hg@hstuart.dk> parents: 8225 diff changeset	443 def _abort(self):
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	444 self.count = 0
11230 5116a077c3da make transactions work on non-refcounted python implementations Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> parents: 10282 diff changeset	445 self.usages = 0
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	446 self.file.close()
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	447 self._backupsfile.close()
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	448
10228 056c366fea8c transaction: initialize self.journal to None after deletion Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9693 diff changeset	449 try:
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	450 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	451 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	452 self.opener.unlink(self.journal)
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	453 if self._backupjournal:
84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	454 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	455 return
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	456
10228 056c366fea8c transaction: initialize self.journal to None after deletion Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 9693 diff changeset	457 self.report(_("transaction abort!\n"))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	458
108 8d55c2d72c7c Warn if we fail to truncate something mpm@selenic.com parents: 95 diff changeset	459 try:
23764 d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	460 for cat in sorted(self._abortcallback):
d486e52352e8 transaction: support for callbacks during abort Gregory Szorc <gregory.szorc@gmail.com> parents: 23727 diff changeset	461 self._abortcallback[cat](self)
23311 64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	462 _playback(self.journal, self.report, self.opener, self._vfsmap,
23249 84720eab4fbd transaction: mark backup-related attributes private Pierre-Yves David <pierre-yves.david@fb.com> parents: 23248 diff changeset	463 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	464 self.report(_("rollback completed\n"))
16689 f366d4c2ff34 cleanup: replace naked excepts with except Exception: ... Brodie Rao <brodie@sf.io> parents: 13408 diff changeset	465 except Exception:
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	466 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	467 finally:
48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	468 self.journal = None
8290 560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	469
560af1bbfd6e transaction: reset transaction on abort Henrik Stuart <hg@hstuart.dk> parents: 8289 diff changeset	470
23311 64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	471 def rollback(opener, vfsmap, file, report):
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	472 """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	473
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	474 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	475 '*.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	476
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	477 * `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	478 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	479 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	480 '*.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	481 pairs, delimited by \0.
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	482 """
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	483 entries = []
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	484 backupentries = []
8294 48a382c23226 transaction: refactor transaction.abort and rollback to use the same code Henrik Stuart <hg@hstuart.dk> parents: 8290 diff changeset	485
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	486 fp = opener.open(file)
13400 14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	487 lines = fp.readlines()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	488 fp.close()
14f3795a5ed7 explicitly close files Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 11685 diff changeset	489 for l in lines:
20524 28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	490 try:
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	491 f, o = l.split('\0')
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	492 entries.append((f, int(o), None))
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	493 except ValueError:
28b8ff84db3f journal: report parsing errors on recover/rollback (issue4172) Matt Mackall <mpm@selenic.com> parents: 20087 diff changeset	494 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	495
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	496 backupjournal = "%s.backupfiles" % file
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	497 if opener.exists(backupjournal):
5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	498 fp = opener.open(backupjournal)
23065 963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	499 lines = fp.readlines()
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	500 if lines:
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	501 ver = lines[0][:-1]
23064 5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	502 if ver == str(version):
23065 963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	503 for line in lines[1:]:
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	504 if line:
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	505 # Shave off the trailing newline
963f311e3a81 transactions: change backupfiles format to use newlines Durham Goode <durham@fb.com> parents: 23064 diff changeset	506 line = line[:-1]
23309 7eb520f5efe4 transaction: change the on disk format for backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23291 diff changeset	507 l, f, b, c = line.split('\0')
7eb520f5efe4 transaction: change the on disk format for backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23291 diff changeset	508 backupentries.append((l, f, b, bool(c)))
23064 5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	509 else:
23309 7eb520f5efe4 transaction: change the on disk format for backupentries Pierre-Yves David <pierre-yves.david@fb.com> parents: 23291 diff changeset	510 report(_("journal was created by a different version of "
23064 5dc888b79e70 transactions: add version number to journal.backupfiles Durham Goode <durham@fb.com> parents: 23063 diff changeset	511 "Mercurial"))
20882 5dffd06f1e50 transaction: add support for non-append files Durham Goode <durham@fb.com> parents: 20881 diff changeset	512
23311 64ab33ffba14 transaction: use the location value when doing backup Pierre-Yves David <pierre-yves.david@fb.com> parents: 23310 diff changeset	513 _playback(file, report, opener, vfsmap, entries, backupentries)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/transaction.py @ 23903:426607be9c69