This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3865

histedit: use self.stateobj to check whether interrupted histedit exists
ClosedPublic

Authored by pulkit on Jun 30 2018, 11:10 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG03e7ec8180f0: histedit: use self.stateobj to check whether interrupted histedit exists
Summary

self.stateobj is an instance of state.cmdstate() class which has an .exists()
function which is used to check whether there exists an interrupted statefile or
not.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (12 lines)

Diff 9391

hgext/histedit.py

[histedit] [histedit]
singletransaction = True singletransaction = True
""" """
from __future__ import absolute_import from __future__ import absolute_import
import errno
import os import os
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
bundle2, bundle2,
cmdutil, cmdutil,
context, context,
copies, copies,
self.stateobj = statemod.cmdstate(repo, 'histedit-state') self.stateobj = statemod.cmdstate(repo, 'histedit-state')
if replacements is None: if replacements is None:
self.replacements = [] self.replacements = []
else: else:
self.replacements = replacements self.replacements = replacements
def read(self): def read(self):
"""Load histedit state from disk and set fields appropriately.""" """Load histedit state from disk and set fields appropriately."""
try: if not self.stateobj.exists():
state = self.repo.vfs.read('histedit-state')
except IOError as err:
if err.errno != errno.ENOENT:
raise
cmdutil.wrongtooltocontinue(self.repo, _('histedit')) cmdutil.wrongtooltocontinue(self.repo, _('histedit'))
data = self._read(state) data = self._read()
self.parentctxnode = data['parentctxnode'] self.parentctxnode = data['parentctxnode']
actions = parserules(data['rules'], self) actions = parserules(data['rules'], self)
self.actions = actions self.actions = actions
self.keep = data['keep'] self.keep = data['keep']
self.topmost = data['topmost'] self.topmost = data['topmost']
self.replacements = data['replacements'] self.replacements = data['replacements']
self.backupfile = data['backupfile'] self.backupfile = data['backupfile']
def _read(self, fp): def _read(self):
fp = self.repo.vfs.read('histedit-state')
if fp.startswith('v1\n'): if fp.startswith('v1\n'):
data = self._load() data = self._load()
parentctxnode, rules, keep, topmost, replacements, backupfile = data parentctxnode, rules, keep, topmost, replacements, backupfile = data
else: else:
data = pickle.loads(fp) data = pickle.loads(fp)
parentctxnode, rules, keep, topmost, replacements = data parentctxnode, rules, keep, topmost, replacements = data
backupfile = None backupfile = None
rules = "\n".join(["%s %s" % (verb, rest) for [verb, rest] in rules]) rules = "\n".join(["%s %s" % (verb, rest) for [verb, rest] in rules])