901 ('n', 'name', '', |
901 ('n', 'name', '', |
902 _('restore shelved change with given name'), _('NAME')), |
902 _('restore shelved change with given name'), _('NAME')), |
903 ('t', 'tool', '', _('specify merge tool')), |
903 ('t', 'tool', '', _('specify merge tool')), |
904 ('', 'date', '', |
904 ('', 'date', '', |
905 _('set date for temporary commits (DEPRECATED)'), _('DATE'))], |
905 _('set date for temporary commits (DEPRECATED)'), _('DATE'))], |
906 _('hg unshelve [[-n] SHELVED]')) |
906 _('hg unshelve [[-n] SHELVED]'), |
|
907 helpcategory=command.CATEGORY_WORKING_DIRECTORY) |
907 def unshelve(ui, repo, *shelved, **opts): |
908 def unshelve(ui, repo, *shelved, **opts): |
908 """restore a shelved change to the working directory |
909 """restore a shelved change to the working directory |
909 |
910 |
910 This command accepts an optional name of a shelved change to |
911 This command accepts an optional name of a shelved change to |
911 restore. If none is given, the most recent shelved change is used. |
912 restore. If none is given, the most recent shelved change is used. |
1071 _('interactive mode, only works while creating a shelve')), |
1072 _('interactive mode, only works while creating a shelve')), |
1072 ('', 'stat', None, |
1073 ('', 'stat', None, |
1073 _('output diffstat-style summary of changes (provide the names of ' |
1074 _('output diffstat-style summary of changes (provide the names of ' |
1074 'the shelved changes as positional arguments)') |
1075 'the shelved changes as positional arguments)') |
1075 )] + cmdutil.walkopts, |
1076 )] + cmdutil.walkopts, |
1076 _('hg shelve [OPTION]... [FILE]...')) |
1077 _('hg shelve [OPTION]... [FILE]...'), |
|
1078 helpcategory=command.CATEGORY_WORKING_DIRECTORY) |
1077 def shelvecmd(ui, repo, *pats, **opts): |
1079 def shelvecmd(ui, repo, *pats, **opts): |
1078 '''save and set aside changes from the working directory |
1080 '''save and set aside changes from the working directory |
1079 |
1081 |
1080 Shelving takes files that "hg status" reports as not clean, saves |
1082 Shelving takes files that "hg status" reports as not clean, saves |
1081 the modifications to a bundle (a shelved change), and reverts the |
1083 the modifications to a bundle (a shelved change), and reverts the |