equal
deleted
inserted
replaced
2675 graftstate.delete() |
2675 graftstate.delete() |
2676 ui.status(_("stopped the interrupted graft\n")) |
2676 ui.status(_("stopped the interrupted graft\n")) |
2677 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12]) |
2677 ui.status(_("working directory is now at %s\n") % pctx.hex()[:12]) |
2678 return 0 |
2678 return 0 |
2679 |
2679 |
|
2680 statemod.addunfinished( |
|
2681 'graft', fname='graftstate', clearable=True, stopflag=True, |
|
2682 continueflag=True, abortfunc=cmdutil.hgabortgraft, |
|
2683 cmdhint=_("use 'hg graft --continue' or 'hg graft --stop' to stop") |
|
2684 ) |
|
2685 |
2680 @command('grep', |
2686 @command('grep', |
2681 [('0', 'print0', None, _('end fields with NUL')), |
2687 [('0', 'print0', None, _('end fields with NUL')), |
2682 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')), |
2688 ('', 'all', None, _('print all revisions that match (DEPRECATED) ')), |
2683 ('', 'diff', None, _('print all revisions when the term was introduced ' |
2689 ('', 'diff', None, _('print all revisions when the term was introduced ' |
2684 'or removed')), |
2690 'or removed')), |