Show More
@@ -7585,7 +7585,7 b' def unshelve(ui, repo, *shelved, **opts)' | |||||
7585 | unshelved. |
|
7585 | unshelved. | |
7586 | """ |
|
7586 | """ | |
7587 | with repo.wlock(): |
|
7587 | with repo.wlock(): | |
7588 |
return shelvemod. |
|
7588 | return shelvemod.unshelvecmd(ui, repo, *shelved, **opts) | |
7589 |
|
7589 | |||
7590 |
|
7590 | |||
7591 | statemod.addunfinished( |
|
7591 | statemod.addunfinished( |
@@ -1074,7 +1074,7 b' def _checkunshelveuntrackedproblems(ui, ' | |||||
1074 | raise error.Abort(m, hint=hint) |
|
1074 | raise error.Abort(m, hint=hint) | |
1075 |
|
1075 | |||
1076 |
|
1076 | |||
1077 |
def |
|
1077 | def unshelvecmd(ui, repo, *shelved, **opts): | |
1078 | opts = pycompat.byteskwargs(opts) |
|
1078 | opts = pycompat.byteskwargs(opts) | |
1079 | abortf = opts.get(b'abort') |
|
1079 | abortf = opts.get(b'abort') | |
1080 | continuef = opts.get(b'continue') |
|
1080 | continuef = opts.get(b'continue') | |
@@ -1121,6 +1121,10 b' def dounshelve(ui, repo, *shelved, **opt' | |||||
1121 | if not shelvedfile(repo, basename, patchextension).exists(): |
|
1121 | if not shelvedfile(repo, basename, patchextension).exists(): | |
1122 | raise error.Abort(_(b"shelved change '%s' not found") % basename) |
|
1122 | raise error.Abort(_(b"shelved change '%s' not found") % basename) | |
1123 |
|
1123 | |||
|
1124 | return _dounshelve(ui, repo, basename, opts) | |||
|
1125 | ||||
|
1126 | ||||
|
1127 | def _dounshelve(ui, repo, basename, opts): | |||
1124 | repo = repo.unfiltered() |
|
1128 | repo = repo.unfiltered() | |
1125 | lock = tr = None |
|
1129 | lock = tr = None | |
1126 | try: |
|
1130 | try: |
General Comments 0
You need to be logged in to leave comments.
Login now