Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py
eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py
- changeset 7010
- 5d6f5a69a952
- parent 6942
- 2602857055c5
- child 7192
- a22eee00b052
equal
deleted
inserted
replaced
| 7009:eaf5ed6ef298 | 7010:5d6f5a69a952 |
|---|---|
| 99 if os.path.splitdrive(repodir)[1] == os.sep: | 99 if os.path.splitdrive(repodir)[1] == os.sep: |
| 100 return False | 100 return False |
| 101 | 101 |
| 102 res = False | 102 res = False |
| 103 from .HgShelveDataDialog import HgShelveDataDialog | 103 from .HgShelveDataDialog import HgShelveDataDialog |
| 104 dlg = HgShelveDataDialog() | 104 dlg = HgShelveDataDialog(self.vcs.version) |
| 105 if dlg.exec_() == QDialog.Accepted: | 105 if dlg.exec_() == QDialog.Accepted: |
| 106 shelveName, dateTime, message, addRemove = dlg.getData() | 106 shelveName, dateTime, message, addRemove, keep = dlg.getData() |
| 107 | 107 |
| 108 args = self.vcs.initCommand("shelve") | 108 args = self.vcs.initCommand("shelve") |
| 109 if shelveName: | 109 if shelveName: |
| 110 args.append("--name") | 110 args.append("--name") |
| 111 args.append(shelveName) | 111 args.append(shelveName) |
| 115 if addRemove: | 115 if addRemove: |
| 116 args.append("--addRemove") | 116 args.append("--addRemove") |
| 117 if dateTime.isValid(): | 117 if dateTime.isValid(): |
| 118 args.append("--date") | 118 args.append("--date") |
| 119 args.append(dateTime.toString("yyyy-MM-dd hh:mm:ss")) | 119 args.append(dateTime.toString("yyyy-MM-dd hh:mm:ss")) |
| 120 if self.vcs.version >= (5, 0, 0) and keep: | |
| 121 args.append("--keep") | |
| 120 args.append("-v") | 122 args.append("-v") |
| 121 | 123 |
| 122 if isinstance(name, list): | 124 if isinstance(name, list): |
| 123 self.vcs.addArguments(args, name) | 125 self.vcs.addArguments(args, name) |
| 124 else: | 126 else: |
