equal
deleted
inserted
replaced
192 _unfinishedstates.append(statecheckobj) |
192 _unfinishedstates.append(statecheckobj) |
193 else: |
193 else: |
194 _unfinishedstates.insert(0, statecheckobj) |
194 _unfinishedstates.insert(0, statecheckobj) |
195 |
195 |
196 addunfinished( |
196 addunfinished( |
197 'unshelve', fname='shelvedstate', continueflag=True, |
|
198 cmdmsg=_('unshelve already in progress') |
|
199 ) |
|
200 addunfinished( |
|
201 'update', fname='updatestate', clearable=True, |
197 'update', fname='updatestate', clearable=True, |
202 cmdmsg=_('last update was interrupted'), |
198 cmdmsg=_('last update was interrupted'), |
203 cmdhint=_("use 'hg update' to get a consistent checkout"), |
199 cmdhint=_("use 'hg update' to get a consistent checkout"), |
204 statushint=_("To continue: hg update") |
200 statushint=_("To continue: hg update") |
205 ) |
201 ) |