| hg-reviewers |
When our experimental nointerrupt feature is enabled, this will
help prevent users from corrupting their repo during a strip.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/repair.py (127 lines) |
| # | # | ||||
| # We do not include obsolescence, it might re-introduce prune markers | # We do not include obsolescence, it might re-introduce prune markers | ||||
| # we are trying to strip. This is harmless since the stripped markers | # we are trying to strip. This is harmless since the stripped markers | ||||
| # are already backed up and we did not touched the markers for the | # are already backed up and we did not touched the markers for the | ||||
| # saved changesets. | # saved changesets. | ||||
| tmpbundlefile = backupbundle(repo, savebases, saveheads, node, 'temp', | tmpbundlefile = backupbundle(repo, savebases, saveheads, node, 'temp', | ||||
| compress=False, obsolescence=False) | compress=False, obsolescence=False) | ||||
| with ui.uninterruptable(): | |||||
| try: | try: | ||||
| with repo.transaction("strip") as tr: | with repo.transaction("strip") as tr: | ||||
| offset = len(tr.entries) | offset = len(tr.entries) | ||||
| tr.startgroup() | tr.startgroup() | ||||
| cl.strip(striprev, tr) | cl.strip(striprev, tr) | ||||
| stripmanifest(repo, striprev, tr, files) | stripmanifest(repo, striprev, tr, files) | ||||
| for fn in files: | for fn in files: | ||||
| repo.file(fn).strip(striprev, tr) | repo.file(fn).strip(striprev, tr) | ||||
| tr.endgroup() | tr.endgroup() | ||||
| for i in xrange(offset, len(tr.entries)): | for i in xrange(offset, len(tr.entries)): | ||||
| file, troffset, ignore = tr.entries[i] | file, troffset, ignore = tr.entries[i] | ||||
| with repo.svfs(file, 'a', checkambig=True) as fp: | with repo.svfs(file, 'a', checkambig=True) as fp: | ||||
| fp.truncate(troffset) | fp.truncate(troffset) | ||||
| if troffset == 0: | if troffset == 0: | ||||
| repo.store.markremoved(file) | repo.store.markremoved(file) | ||||
| deleteobsmarkers(repo.obsstore, stripobsidx) | deleteobsmarkers(repo.obsstore, stripobsidx) | ||||
| del repo.obsstore | del repo.obsstore | ||||
| repo.invalidatevolatilesets() | repo.invalidatevolatilesets() | ||||
| repo._phasecache.filterunknown(repo) | repo._phasecache.filterunknown(repo) | ||||
| if tmpbundlefile: | if tmpbundlefile: | ||||
| ui.note(_("adding branch\n")) | ui.note(_("adding branch\n")) | ||||
| f = vfs.open(tmpbundlefile, "rb") | f = vfs.open(tmpbundlefile, "rb") | ||||
| gen = exchange.readbundle(ui, f, tmpbundlefile, vfs) | gen = exchange.readbundle(ui, f, tmpbundlefile, vfs) | ||||
| if not repo.ui.verbose: | if not repo.ui.verbose: | ||||
| # silence internal shuffling chatter | # silence internal shuffling chatter | ||||
| repo.ui.pushbuffer() | repo.ui.pushbuffer() | ||||
| tmpbundleurl = 'bundle:' + vfs.join(tmpbundlefile) | tmpbundleurl = 'bundle:' + vfs.join(tmpbundlefile) | ||||
| txnname = 'strip' | txnname = 'strip' | ||||
| if not isinstance(gen, bundle2.unbundle20): | if not isinstance(gen, bundle2.unbundle20): | ||||
| txnname = "strip\n%s" % util.hidepassword(tmpbundleurl) | txnname = "strip\n%s" % util.hidepassword(tmpbundleurl) | ||||
| with repo.transaction(txnname) as tr: | with repo.transaction(txnname) as tr: | ||||
| bundle2.applybundle(repo, gen, tr, source='strip', | bundle2.applybundle(repo, gen, tr, source='strip', | ||||
| url=tmpbundleurl) | url=tmpbundleurl) | ||||
| if not repo.ui.verbose: | if not repo.ui.verbose: | ||||
| repo.ui.popbuffer() | repo.ui.popbuffer() | ||||
| f.close() | f.close() | ||||
| with repo.transaction('repair') as tr: | with repo.transaction('repair') as tr: | ||||
| bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] | bmchanges = [(m, repo[newbmtarget].node()) for m in updatebm] | ||||
| bm.applychanges(repo, tr, bmchanges) | bm.applychanges(repo, tr, bmchanges) | ||||
| # remove undo files | # remove undo files | ||||
| for undovfs, undofile in repo.undofiles(): | for undovfs, undofile in repo.undofiles(): | ||||
| try: | try: | ||||
| undovfs.unlink(undofile) | undovfs.unlink(undofile) | ||||
| except OSError as e: | except OSError as e: | ||||
| if e.errno != errno.ENOENT: | if e.errno != errno.ENOENT: | ||||
| ui.warn(_('error removing %s: %s\n') % | ui.warn(_('error removing %s: %s\n') % | ||||
| (undovfs.join(undofile), | (undovfs.join(undofile), | ||||
| stringutil.forcebytestr(e))) | stringutil.forcebytestr(e))) | ||||
| except: # re-raises | except: # re-raises | ||||
| if backupfile: | if backupfile: | ||||
| ui.warn(_("strip failed, backup bundle stored in '%s'\n") | ui.warn(_("strip failed, backup bundle stored in '%s'\n") | ||||
| % vfs.join(backupfile)) | % vfs.join(backupfile)) | ||||
| if tmpbundlefile: | if tmpbundlefile: | ||||
| ui.warn(_("strip failed, unrecovered changes stored in '%s'\n") | ui.warn(_("strip failed, unrecovered changes stored in '%s'\n") | ||||
| % vfs.join(tmpbundlefile)) | % vfs.join(tmpbundlefile)) | ||||
| ui.warn(_("(fix the problem, then recover the changesets with " | ui.warn(_("(fix the problem, then recover the changesets with " | ||||
| "\"hg unbundle '%s'\")\n") % vfs.join(tmpbundlefile)) | "\"hg unbundle '%s'\")\n") % vfs.join(tmpbundlefile)) | ||||
| raise | raise | ||||
| else: | else: | ||||
| if tmpbundlefile: | if tmpbundlefile: | ||||
| # Remove temporary bundle only if there were no exceptions | # Remove temporary bundle only if there were no exceptions | ||||
| vfs.unlink(tmpbundlefile) | vfs.unlink(tmpbundlefile) | ||||
| repo.destroyed() | repo.destroyed() | ||||
| # return the backup file path (or None if 'backup' was False) so | # return the backup file path (or None if 'backup' was False) so | ||||
| # extensions can use it | # extensions can use it | ||||
| return backupfile | return backupfile | ||||
| def safestriproots(ui, repo, nodes): | def safestriproots(ui, repo, nodes): | ||||
| """return list of roots of nodes where descendants are covered by nodes""" | """return list of roots of nodes where descendants are covered by nodes""" | ||||