Mercurial Repositories > eric / file diff

--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Sun May 12 15:31:23 2019 +0200
+++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Tue May 14 19:52:39 2019 +0200
@@ -101,9 +101,9 @@
         
         res = False
         from .HgShelveDataDialog import HgShelveDataDialog
-        dlg = HgShelveDataDialog()
+        dlg = HgShelveDataDialog(self.vcs.version)
         if dlg.exec_() == QDialog.Accepted:
-            shelveName, dateTime, message, addRemove = dlg.getData()
+            shelveName, dateTime, message, addRemove, keep = dlg.getData()
             
             args = self.vcs.initCommand("shelve")
             if shelveName:
@@ -117,6 +117,8 @@
             if dateTime.isValid():
                 args.append("--date")
                 args.append(dateTime.toString("yyyy-MM-dd hh:mm:ss"))
+            if self.vcs.version >= (5, 0, 0) and keep:
+                args.append("--keep")
             args.append("-v")
             
             if isinstance(name, list):