3171 # Since graft cannot be aborted, it is considered 'clearable' by update. |
3171 # Since graft cannot be aborted, it is considered 'clearable' by update. |
3172 # note: bisect is intentionally excluded |
3172 # note: bisect is intentionally excluded |
3173 # (state file, clearable, allowcommit, error, hint) |
3173 # (state file, clearable, allowcommit, error, hint) |
3174 unfinishedstates = [ |
3174 unfinishedstates = [ |
3175 ('graftstate', True, False, _('graft in progress'), |
3175 ('graftstate', True, False, _('graft in progress'), |
3176 _("use 'hg graft --continue' or 'hg update' to abort")), |
3176 _("use 'hg graft --continue' or 'hg graft --stop' to abort")), |
3177 ('updatestate', True, False, _('last update was interrupted'), |
3177 ('updatestate', True, False, _('last update was interrupted'), |
3178 _("use 'hg update' to get a consistent checkout")) |
3178 _("use 'hg update' to get a consistent checkout")) |
3179 ] |
3179 ] |
3180 |
3180 |
3181 def checkunfinished(repo, commit=False): |
3181 def checkunfinished(repo, commit=False): |