1182 # where tmpwctx is an optional commit with the user's pending changes |
1182 # where tmpwctx is an optional commit with the user's pending changes |
1183 # and shelvectx is the unshelved changes. Then we merge it all down |
1183 # and shelvectx is the unshelved changes. Then we merge it all down |
1184 # to the original pctx. |
1184 # to the original pctx. |
1185 |
1185 |
1186 activebookmark = _backupactivebookmark(repo) |
1186 activebookmark = _backupactivebookmark(repo) |
1187 tmpwctx, addedbefore = _commitworkingcopychanges( |
1187 tmpwctx, addedbefore = _commitworkingcopychanges(ui, repo, opts, pctx) |
1188 ui, repo, opts, pctx |
|
1189 ) |
|
1190 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename) |
1188 repo, shelvectx = _unshelverestorecommit(ui, repo, tr, basename) |
1191 _checkunshelveuntrackedproblems(ui, repo, shelvectx) |
1189 _checkunshelveuntrackedproblems(ui, repo, shelvectx) |
1192 branchtorestore = b'' |
1190 branchtorestore = b'' |
1193 if shelvectx.branch() != shelvectx.p1().branch(): |
1191 if shelvectx.branch() != shelvectx.p1().branch(): |
1194 branchtorestore = shelvectx.branch() |
1192 branchtorestore = shelvectx.branch() |