6166 @command('unshelve', |
6166 @command('unshelve', |
6167 [('a', 'abort', None, |
6167 [('a', 'abort', None, |
6168 _('abort an incomplete unshelve operation')), |
6168 _('abort an incomplete unshelve operation')), |
6169 ('c', 'continue', None, |
6169 ('c', 'continue', None, |
6170 _('continue an incomplete unshelve operation')), |
6170 _('continue an incomplete unshelve operation')), |
|
6171 ('i', 'interactive', None, |
|
6172 _('use interactive mode')), |
6171 ('k', 'keep', None, |
6173 ('k', 'keep', None, |
6172 _('keep shelve after unshelving')), |
6174 _('keep shelve after unshelving')), |
6173 ('n', 'name', '', |
6175 ('n', 'name', '', |
6174 _('restore shelved change with given name'), _('NAME')), |
6176 _('restore shelved change with given name'), _('NAME')), |
6175 ('t', 'tool', '', _('specify merge tool')), |
6177 ('t', 'tool', '', _('specify merge tool')), |
6176 ('', 'date', '', |
6178 ('', 'date', '', |
6177 _('set date for temporary commits (DEPRECATED)'), _('DATE'))], |
6179 _('set date for temporary commits (DEPRECATED)'), _('DATE'))], |
6178 _('hg unshelve [[-n] SHELVED]'), |
6180 _('hg unshelve [OPTION]... [FILE]... [-n SHELVED]'), |
6179 helpcategory=command.CATEGORY_WORKING_DIRECTORY) |
6181 helpcategory=command.CATEGORY_WORKING_DIRECTORY) |
6180 def unshelve(ui, repo, *shelved, **opts): |
6182 def unshelve(ui, repo, *shelved, **opts): |
6181 """restore a shelved change to the working directory |
6183 """restore a shelved change to the working directory |
6182 |
6184 |
6183 This command accepts an optional name of a shelved change to |
6185 This command accepts an optional name of a shelved change to |