comparison mercurial/commands.py @ 44595:47c1226463a1

shelve: split up dounshelve() in unshelvecmd() and _dounshelve() I'd like to be able to override the new `_dounshelve()`, getting access to the name of the shelve to unshelve. `unshelvecmd()` seems to better match the existing `createcmd()`, `listcmd()` etc. Differential Revision: https://phab.mercurial-scm.org/D8322
author Martin von Zweigbergk <martinvonz@google.com>
date Mon, 23 Mar 2020 15:14:42 -0700
parents bd7b2c8d06cc
children 1b8fd4af3318
comparison
equal deleted inserted replaced
44593:496868f1030c 44595:47c1226463a1
7583 running interactively. So, this will bring up all the conflicts between 7583 running interactively. So, this will bring up all the conflicts between
7584 working directory and the shelve, irrespective of which changes will be 7584 working directory and the shelve, irrespective of which changes will be
7585 unshelved. 7585 unshelved.
7586 """ 7586 """
7587 with repo.wlock(): 7587 with repo.wlock():
7588 return shelvemod.dounshelve(ui, repo, *shelved, **opts) 7588 return shelvemod.unshelvecmd(ui, repo, *shelved, **opts)
7589 7589
7590 7590
7591 statemod.addunfinished( 7591 statemod.addunfinished(
7592 b'unshelve', 7592 b'unshelve',
7593 fname=b'shelvedstate', 7593 fname=b'shelvedstate',