| hg-reviewers |
Fatcoring out the logic in a separate function will help us in adding
conditional logic for different versions of graft state files.
| Lint Skipped |
| Unit Tests Skipped |
| cont = False | cont = False | ||||
| if opts.get('continue'): | if opts.get('continue'): | ||||
| cont = True | cont = True | ||||
| if revs: | if revs: | ||||
| raise error.Abort(_("can't specify --continue and revisions")) | raise error.Abort(_("can't specify --continue and revisions")) | ||||
| # read in unfinished revisions | # read in unfinished revisions | ||||
| try: | try: | ||||
| nodes = repo.vfs.read('graftstate').splitlines() | nodes = _readgraftstate(repo)['nodes'] | ||||
| revs = [repo[node].rev() for node in nodes] | revs = [repo[node].rev() for node in nodes] | ||||
| except IOError as inst: | except IOError as inst: | ||||
| if inst.errno != errno.ENOENT: | if inst.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| cmdutil.wrongtooltocontinue(repo, _('graft')) | cmdutil.wrongtooltocontinue(repo, _('graft')) | ||||
| else: | else: | ||||
| if not revs: | if not revs: | ||||
| raise error.Abort(_('no revisions specified')) | raise error.Abort(_('no revisions specified')) | ||||
| (ctx.rev(), ctx)) | (ctx.rev(), ctx)) | ||||
| # remove state when we complete successfully | # remove state when we complete successfully | ||||
| if not opts.get('dry_run'): | if not opts.get('dry_run'): | ||||
| repo.vfs.unlinkpath('graftstate', ignoremissing=True) | repo.vfs.unlinkpath('graftstate', ignoremissing=True) | ||||
| return 0 | 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', | @command('grep', | ||||
| [('0', 'print0', None, _('end fields with NUL')), | [('0', 'print0', None, _('end fields with NUL')), | ||||
| ('', 'all', None, _('print all revisions that match')), | ('', 'all', None, _('print all revisions that match')), | ||||
| ('a', 'text', None, _('treat all files as text')), | ('a', 'text', None, _('treat all files as text')), | ||||
| ('f', 'follow', None, | ('f', 'follow', None, | ||||
| _('follow changeset history,' | _('follow changeset history,' | ||||
| ' or file history across copies and renames')), | ' or file history across copies and renames')), | ||||
| ('i', 'ignore-case', None, _('ignore case when matching')), | ('i', 'ignore-case', None, _('ignore case when matching')), | ||||