Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 38311:47f5454a30ed
cmdutil: say that `graft --stop` stops the graft instead of aborting
I am going to add a --abort flag to graft soon, so we make sure we differentiate
between the what --stop flag does and what --abort does and don't use the words
interchangeably.
Differential Revision: https://phab.mercurial-scm.org/D3735
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 15 Jun 2018 02:07:39 +0530 |
| parents | 2ec44160165d |
| children | 50f5fc232c16 |
comparison
equal
deleted
inserted
replaced
| 38310:2049a21c8396 | 38311:47f5454a30ed |
|---|---|
| 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 graft --stop' to abort")), | 3176 _("use 'hg graft --continue' or 'hg graft --stop' to stop")), |
| 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): |