2108 # Since graft cannot be aborted, it is considered 'clearable' by update. |
2108 # Since graft cannot be aborted, it is considered 'clearable' by update. |
2109 # note: bisect is intentionally excluded |
2109 # note: bisect is intentionally excluded |
2110 # (state file, clearable, error, hint) |
2110 # (state file, clearable, error, hint) |
2111 unfinishedstates = [ |
2111 unfinishedstates = [ |
2112 ('graftstate', True, _('graft in progress'), |
2112 ('graftstate', True, _('graft in progress'), |
2113 _("use 'hg graft --continue' or 'hg update' to abort")) |
2113 _("use 'hg graft --continue' or 'hg update' to abort")), |
|
2114 ('updatestate', True, _('last update was interrupted'), |
|
2115 _("use 'hg update' to get a consistent checkout")) |
2114 ] |
2116 ] |
2115 |
2117 |
2116 def checkunfinished(repo): |
2118 def checkunfinished(repo): |
2117 '''Look for an unfinished multistep operation, like graft, and abort |
2119 '''Look for an unfinished multistep operation, like graft, and abort |
2118 if found. It's probably good to check this right before |
2120 if found. It's probably good to check this right before |