6180 prevents from deciding exact order of them, for safety. |
6180 prevents from deciding exact order of them, for safety. |
6181 """ |
6181 """ |
6182 with repo.wlock(): |
6182 with repo.wlock(): |
6183 return shelvemod.dounshelve(ui, repo, *shelved, **opts) |
6183 return shelvemod.dounshelve(ui, repo, *shelved, **opts) |
6184 |
6184 |
|
6185 statemod.addunfinished( |
|
6186 'unshelve', fname='shelvedstate', continueflag=True, |
|
6187 abortfunc=shelvemod.hgabortunshelve, |
|
6188 cmdmsg=_('unshelve already in progress'), |
|
6189 ) |
|
6190 |
6185 @command('update|up|checkout|co', |
6191 @command('update|up|checkout|co', |
6186 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
6192 [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
6187 ('c', 'check', None, _('require clean working directory')), |
6193 ('c', 'check', None, _('require clean working directory')), |
6188 ('m', 'merge', None, _('merge uncommitted changes')), |
6194 ('m', 'merge', None, _('merge uncommitted changes')), |
6189 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |
6195 ('d', 'date', '', _('tipmost revision matching date'), _('DATE')), |