This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3863

histedit: factor out logic of processing state data in separate fn
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGc6a2ce82e60b: histedit: factor out logic of processing state data in separate fn
Summary

The new function will serve as the point from where we always get a dictionary
of data stored in the statefile and will be helpful in integrating
state.cmdstate.read() to write statefile in cbor.

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 (27 lines)

Diff 9389

hgext/histedit.py

"""Load histedit state from disk and set fields appropriately.""" """Load histedit state from disk and set fields appropriately."""
try: try:
state = self.repo.vfs.read('histedit-state') state = self.repo.vfs.read('histedit-state')
except IOError as err: except IOError as err:
if err.errno != errno.ENOENT: if err.errno != errno.ENOENT:
raise raise
cmdutil.wrongtooltocontinue(self.repo, _('histedit')) cmdutil.wrongtooltocontinue(self.repo, _('histedit'))
if state.startswith('v1\n'): data = self._read(state)
self.parentctxnode = data['parentctxnode']
actions = parserules(data['rules'], self)
self.actions = actions
self.keep = data['keep']
self.topmost = data['topmost']
self.replacements = data['replacements']
self.backupfile = data['backupfile']
def _read(self, fp):
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(state) data = pickle.loads(fp)
parentctxnode, rules, keep, topmost, replacements = data parentctxnode, rules, keep, topmost, replacements = data
backupfile = None backupfile = None
self.parentctxnode = parentctxnode
rules = "\n".join(["%s %s" % (verb, rest) for [verb, rest] in rules]) rules = "\n".join(["%s %s" % (verb, rest) for [verb, rest] in rules])
actions = parserules(rules, self)
self.actions = actions return {'parentctxnode': parentctxnode, "rules": rules, "keep": keep,
self.keep = keep "topmost": topmost, "replacements": replacements,
self.topmost = topmost "backupfile": backupfile}
self.replacements = replacements
self.backupfile = backupfile
def write(self, tr=None): def write(self, tr=None):
if tr: if tr:
tr.addfilegenerator('histedit-state', ('histedit-state',), tr.addfilegenerator('histedit-state', ('histedit-state',),
self._write, location='plain') self._write, location='plain')
else: else:
with self.repo.vfs("histedit-state", "w") as f: with self.repo.vfs("histedit-state", "w") as f:
self._write(f) self._write(f)