Mercurial > public > mercurial-scm > hg-stable
diff mercurial/repair.py @ 8073:e8a28556a0a8
strip: make repair.strip transactional to avoid repository corruption
Uses a transaction instance from the local repository to journal the
truncation of revlog files, such that if a strip only partially completes,
hg recover will be able to finish the truncate of all the files.
The potential unbundling of changes that have been backed up to be restored
later will, in case of an error, have to be unbundled manually. The
difference is that it will be possible to recover the repository state so
the unbundle can actually succeed.
| author | Henrik Stuart <henrik.stuart@edlund.dk> |
|---|---|
| date | Thu, 16 Apr 2009 15:34:03 +0200 |
| parents | 9fe97eea5510 |
| children | 46293a0c7e9f |
line wrap: on
line diff
--- a/mercurial/repair.py Wed Apr 15 19:54:22 2009 +0200 +++ b/mercurial/repair.py Thu Apr 16 15:34:03 2009 +0200 @@ -118,11 +118,25 @@ chgrpfile = _bundle(repo, savebases, saveheads, node, 'temp', extranodes) - cl.strip(striprev) - repo.manifest.strip(striprev) - for name in files: - f = repo.file(name) - f.strip(striprev) + fs = [repo.file(name) for name in files] + mfst = repo.manifest + + tr = repo.transaction() + offset = len(tr.entries) + + cl.strip(striprev, tr) + mfst.strip(striprev, tr) + for f in fs: + f.strip(striprev, tr) + + try: + for i in xrange(offset, len(tr.entries)): + file, troffset, ignore = tr.entries[i] + repo.sopener(file, 'a').truncate(troffset) + tr.close() + except: + tr.abort() + raise if saveheads or extranodes: ui.status(_("adding branch\n"))