##// END OF EJS Templates
shelve: stop passing list of files to revert...
Martin von Zweigbergk -
r42204:46065855 default
parent child Browse files
Show More
@@ -646,10 +646,6 b' def checkparents(repo, state):'
646 raise error.Abort(_('working directory parents do not match unshelve '
646 raise error.Abort(_('working directory parents do not match unshelve '
647 'state'))
647 'state'))
648
648
649 def pathtofiles(repo, files):
650 cwd = repo.getcwd()
651 return [repo.pathto(f, cwd) for f in files]
652
653 def unshelveabort(ui, repo, state, opts):
649 def unshelveabort(ui, repo, state, opts):
654 """subcommand that abort an in-progress unshelve"""
650 """subcommand that abort an in-progress unshelve"""
655 with repo.lock():
651 with repo.lock():
@@ -689,7 +685,6 b' def mergefiles(ui, repo, wctx, shelvectx'
689 scmutil.backuppath(ui, repo, file))
685 scmutil.backuppath(ui, repo, file))
690 ui.pushbuffer(True)
686 ui.pushbuffer(True)
691 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
687 cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(),
692 *pathtofiles(repo, files),
693 **{r'no_backup': True})
688 **{r'no_backup': True})
694 ui.popbuffer()
689 ui.popbuffer()
695
690
General Comments 0
You need to be logged in to leave comments. Login now