comparison hgext/histedit.py @ 28123:6c1b7f80f90f

histedit: suggest the correct tool to continue (not histedit) Suggest committing (or whatever the current activity is), via wrongtooltocontinue which uses howtocontinue.
author timeless <timeless@mozdev.org>
date Thu, 04 Feb 2016 03:47:00 +0000
parents 27ae22a4f9f9
children 47317570ab8c
comparison
equal deleted inserted replaced
28122:6025ddb4e649 28123:6c1b7f80f90f
277 try: 277 try:
278 state = self.repo.vfs.read('histedit-state') 278 state = self.repo.vfs.read('histedit-state')
279 except IOError as err: 279 except IOError as err:
280 if err.errno != errno.ENOENT: 280 if err.errno != errno.ENOENT:
281 raise 281 raise
282 raise error.Abort(_('no histedit in progress')) 282 cmdutil.wrongtooltocontinue(self.repo, _('histedit'))
283 283
284 if state.startswith('v1\n'): 284 if state.startswith('v1\n'):
285 data = self._load() 285 data = self._load()
286 parentctxnode, rules, keep, topmost, replacements, backupfile = data 286 parentctxnode, rules, keep, topmost, replacements, backupfile = data
287 else: 287 else: