diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -2222,7 +2222,7 @@ raise error.Abort(_("can't specify --continue and revisions")) # read in unfinished revisions try: - nodes = repo.vfs.read('graftstate').splitlines() + nodes = _readgraftstate(repo)['nodes'] revs = [repo[node].rev() for node in nodes] except IOError as inst: if inst.errno != errno.ENOENT: @@ -2381,6 +2381,11 @@ return 0 +def _readgraftstate(repo): + """read the graft state file and return a dict of the data stored in it""" + nodes = repo.vfs.read('graftstate').splitlines() + return {'nodes': nodes} + @command('grep', [('0', 'print0', None, _('end fields with NUL')), ('', 'all', None, _('print all revisions that match')),