Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py
eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py
- changeset 7759
- 51aa6c6b66f7
- parent 7370
- 5fb53279f2df
- child 7900
- 72b88fb20261
- child 7924
- 8a96736d465e
equal
deleted
inserted
replaced
| 7758:dd54d33d21d2 | 7759:51aa6c6b66f7 |
|---|---|
| 81 return False | 81 return False |
| 82 | 82 |
| 83 res = False | 83 res = False |
| 84 from .HgShelveDataDialog import HgShelveDataDialog | 84 from .HgShelveDataDialog import HgShelveDataDialog |
| 85 dlg = HgShelveDataDialog(self.vcs.version) | 85 dlg = HgShelveDataDialog(self.vcs.version) |
| 86 if dlg.exec_() == QDialog.Accepted: | 86 if dlg.exec() == QDialog.Accepted: |
| 87 shelveName, dateTime, message, addRemove, keep = dlg.getData() | 87 shelveName, dateTime, message, addRemove, keep = dlg.getData() |
| 88 | 88 |
| 89 args = self.vcs.initCommand("shelve") | 89 args = self.vcs.initCommand("shelve") |
| 90 if shelveName: | 90 if shelveName: |
| 91 args.append("--name") | 91 args.append("--name") |
| 108 args.append(name) | 108 args.append(name) |
| 109 | 109 |
| 110 dia = HgDialog(self.tr('Shelve current changes'), self.vcs) | 110 dia = HgDialog(self.tr('Shelve current changes'), self.vcs) |
| 111 res = dia.startProcess(args, repodir) | 111 res = dia.startProcess(args, repodir) |
| 112 if res: | 112 if res: |
| 113 dia.exec_() | 113 dia.exec() |
| 114 res = dia.hasAddOrDelete() | 114 res = dia.hasAddOrDelete() |
| 115 self.vcs.checkVCSStatus() | 115 self.vcs.checkVCSStatus() |
| 116 return res | 116 return res |
| 117 | 117 |
| 118 def hgShelveBrowser(self, projectDir): | 118 def hgShelveBrowser(self, projectDir): |
| 145 | 145 |
| 146 res = False | 146 res = False |
| 147 from .HgUnshelveDataDialog import HgUnshelveDataDialog | 147 from .HgUnshelveDataDialog import HgUnshelveDataDialog |
| 148 dlg = HgUnshelveDataDialog(self.__hgGetShelveNamesList(repodir), | 148 dlg = HgUnshelveDataDialog(self.__hgGetShelveNamesList(repodir), |
| 149 shelveName=shelveName) | 149 shelveName=shelveName) |
| 150 if dlg.exec_() == QDialog.Accepted: | 150 if dlg.exec() == QDialog.Accepted: |
| 151 shelveName, keep = dlg.getData() | 151 shelveName, keep = dlg.getData() |
| 152 self.__unshelveKeep = keep # store for potential continue | 152 self.__unshelveKeep = keep # store for potential continue |
| 153 | 153 |
| 154 args = self.vcs.initCommand("unshelve") | 154 args = self.vcs.initCommand("unshelve") |
| 155 if keep: | 155 if keep: |
| 158 args.append(shelveName) | 158 args.append(shelveName) |
| 159 | 159 |
| 160 dia = HgDialog(self.tr('Restore shelved changes'), self.vcs) | 160 dia = HgDialog(self.tr('Restore shelved changes'), self.vcs) |
| 161 res = dia.startProcess(args, repodir) | 161 res = dia.startProcess(args, repodir) |
| 162 if res: | 162 if res: |
| 163 dia.exec_() | 163 dia.exec() |
| 164 res = dia.hasAddOrDelete() | 164 res = dia.hasAddOrDelete() |
| 165 self.vcs.checkVCSStatus() | 165 self.vcs.checkVCSStatus() |
| 166 return res | 166 return res |
| 167 | 167 |
| 168 def hgUnshelveAbort(self, name): | 168 def hgUnshelveAbort(self, name): |
| 183 args.append("--abort") | 183 args.append("--abort") |
| 184 | 184 |
| 185 dia = HgDialog(self.tr('Abort restore operation'), self.vcs) | 185 dia = HgDialog(self.tr('Abort restore operation'), self.vcs) |
| 186 res = dia.startProcess(args, repodir) | 186 res = dia.startProcess(args, repodir) |
| 187 if res: | 187 if res: |
| 188 dia.exec_() | 188 dia.exec() |
| 189 res = dia.hasAddOrDelete() | 189 res = dia.hasAddOrDelete() |
| 190 self.vcs.checkVCSStatus() | 190 self.vcs.checkVCSStatus() |
| 191 return res | 191 return res |
| 192 | 192 |
| 193 def hgUnshelveContinue(self, name): | 193 def hgUnshelveContinue(self, name): |
| 210 args.append("--continue") | 210 args.append("--continue") |
| 211 | 211 |
| 212 dia = HgDialog(self.tr('Continue restore operation'), self.vcs) | 212 dia = HgDialog(self.tr('Continue restore operation'), self.vcs) |
| 213 res = dia.startProcess(args, repodir) | 213 res = dia.startProcess(args, repodir) |
| 214 if res: | 214 if res: |
| 215 dia.exec_() | 215 dia.exec() |
| 216 res = dia.hasAddOrDelete() | 216 res = dia.hasAddOrDelete() |
| 217 self.vcs.checkVCSStatus() | 217 self.vcs.checkVCSStatus() |
| 218 return res | 218 return res |
| 219 | 219 |
| 220 def hgDeleteShelves(self, name, shelveNames=None): | 220 def hgDeleteShelves(self, name, shelveNames=None): |
| 234 if not shelveNames: | 234 if not shelveNames: |
| 235 from .HgShelvesSelectionDialog import HgShelvesSelectionDialog | 235 from .HgShelvesSelectionDialog import HgShelvesSelectionDialog |
| 236 dlg = HgShelvesSelectionDialog( | 236 dlg = HgShelvesSelectionDialog( |
| 237 self.tr("Select the shelves to be deleted:"), | 237 self.tr("Select the shelves to be deleted:"), |
| 238 self.__hgGetShelveNamesList(repodir)) | 238 self.__hgGetShelveNamesList(repodir)) |
| 239 if dlg.exec_() == QDialog.Accepted: | 239 if dlg.exec() == QDialog.Accepted: |
| 240 shelveNames = dlg.getSelectedShelves() | 240 shelveNames = dlg.getSelectedShelves() |
| 241 else: | 241 else: |
| 242 return | 242 return |
| 243 | 243 |
| 244 from UI.DeleteFilesConfirmationDialog import ( | 244 from UI.DeleteFilesConfirmationDialog import ( |
| 247 dlg = DeleteFilesConfirmationDialog( | 247 dlg = DeleteFilesConfirmationDialog( |
| 248 None, | 248 None, |
| 249 self.tr("Delete shelves"), | 249 self.tr("Delete shelves"), |
| 250 self.tr("Do you really want to delete these shelves?"), | 250 self.tr("Do you really want to delete these shelves?"), |
| 251 shelveNames) | 251 shelveNames) |
| 252 if dlg.exec_() == QDialog.Accepted: | 252 if dlg.exec() == QDialog.Accepted: |
| 253 args = self.vcs.initCommand("shelve") | 253 args = self.vcs.initCommand("shelve") |
| 254 args.append("--delete") | 254 args.append("--delete") |
| 255 args.extend(shelveNames) | 255 args.extend(shelveNames) |
| 256 | 256 |
| 257 dia = HgDialog(self.tr('Delete shelves'), self.vcs) | 257 dia = HgDialog(self.tr('Delete shelves'), self.vcs) |
| 258 res = dia.startProcess(args, repodir) | 258 res = dia.startProcess(args, repodir) |
| 259 if res: | 259 if res: |
| 260 dia.exec_() | 260 dia.exec() |
| 261 | 261 |
| 262 def hgCleanupShelves(self, name): | 262 def hgCleanupShelves(self, name): |
| 263 """ | 263 """ |
| 264 Public method to delete all shelves. | 264 Public method to delete all shelves. |
| 265 | 265 |
| 281 args.append("--cleanup") | 281 args.append("--cleanup") |
| 282 | 282 |
| 283 dia = HgDialog(self.tr('Delete all shelves'), self.vcs) | 283 dia = HgDialog(self.tr('Delete all shelves'), self.vcs) |
| 284 res = dia.startProcess(args, repodir) | 284 res = dia.startProcess(args, repodir) |
| 285 if res: | 285 if res: |
| 286 dia.exec_() | 286 dia.exec() |
