1001 branchtorestore, activebookmark) |
1001 branchtorestore, activebookmark) |
1002 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
1002 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
1003 with ui.configoverride(overrides, 'unshelve'): |
1003 with ui.configoverride(overrides, 'unshelve'): |
1004 mergefiles(ui, repo, pctx, shelvectx) |
1004 mergefiles(ui, repo, pctx, shelvectx) |
1005 restorebranch(ui, repo, branchtorestore) |
1005 restorebranch(ui, repo, branchtorestore) |
|
1006 shelvedstate.clear(repo) |
|
1007 _finishunshelve(repo, oldtiprev, tr, activebookmark) |
1006 if not ispartialunshelve: |
1008 if not ispartialunshelve: |
1007 _forgetunknownfiles(repo, shelvectx, addedbefore) |
1009 _forgetunknownfiles(repo, shelvectx, addedbefore) |
1008 |
|
1009 shelvedstate.clear(repo) |
|
1010 _finishunshelve(repo, oldtiprev, tr, activebookmark) |
|
1011 unshelvecleanup(ui, repo, basename, opts) |
1010 unshelvecleanup(ui, repo, basename, opts) |
1012 finally: |
1011 finally: |
1013 if tr: |
1012 if tr: |
1014 tr.release() |
1013 tr.release() |
1015 lockmod.release(lock) |
1014 lockmod.release(lock) |