Show More
@@ -6209,7 +6209,7 b' def unshelve(ui, repo, *shelved, **opts)' | |||||
6209 | prevents from deciding exact order of them, for safety. |
|
6209 | prevents from deciding exact order of them, for safety. | |
6210 | """ |
|
6210 | """ | |
6211 | with repo.wlock(): |
|
6211 | with repo.wlock(): | |
6212 |
return shelvemod. |
|
6212 | return shelvemod.dounshelve(ui, repo, *shelved, **opts) | |
6213 |
|
6213 | |||
6214 | @command('update|up|checkout|co', |
|
6214 | @command('update|up|checkout|co', | |
6215 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
|
6215 | [('C', 'clean', None, _('discard uncommitted changes (no backup)')), |
@@ -845,7 +845,7 b' def _checkunshelveuntrackedproblems(ui, ' | |||||
845 | hint = _("run hg status to see which files are missing") |
|
845 | hint = _("run hg status to see which files are missing") | |
846 | raise error.Abort(m, hint=hint) |
|
846 | raise error.Abort(m, hint=hint) | |
847 |
|
847 | |||
848 |
def |
|
848 | def dounshelve(ui, repo, *shelved, **opts): | |
849 | opts = pycompat.byteskwargs(opts) |
|
849 | opts = pycompat.byteskwargs(opts) | |
850 | abortf = opts.get('abort') |
|
850 | abortf = opts.get('abort') | |
851 | continuef = opts.get('continue') |
|
851 | continuef = opts.get('continue') |
General Comments 0
You need to be logged in to leave comments.
Login now