Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3058
- 0a02c433f52d
- parent 3036
- 30c81c9e88b8
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 121 output = str( | 121 output = str( |
| 122 process.readAllStandardOutput(), ioEncoding, 'replace') | 122 process.readAllStandardOutput(), ioEncoding, 'replace') |
| 123 | 123 |
| 124 for line in output.splitlines(): | 124 for line in output.splitlines(): |
| 125 if withSummary: | 125 if withSummary: |
| 126 l = line.strip().split(": ") | 126 li = line.strip().split(": ") |
| 127 if len(l) == 1: | 127 if len(li) == 1: |
| 128 patch, summary = l[0][:-1], "" | 128 patch, summary = li[0][:-1], "" |
| 129 else: | 129 else: |
| 130 patch, summary = l[0], l[1] | 130 patch, summary = li[0], li[1] |
| 131 patchesList.append("{0}@@{1}".format(patch, summary)) | 131 patchesList.append("{0}@@{1}".format(patch, summary)) |
| 132 else: | 132 else: |
| 133 patchesList.append(line.strip()) | 133 patchesList.append(line.strip()) |
| 134 | 134 |
| 135 return patchesList | 135 return patchesList |
| 249 | 249 |
| 250 from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog | 250 from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog |
| 251 dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) | 251 dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) |
| 252 if dlg.exec_() == QDialog.Accepted: | 252 if dlg.exec_() == QDialog.Accepted: |
| 253 name, message, (userData, currentUser, userName), \ | 253 name, message, (userData, currentUser, userName), \ |
| 254 (dateData, currentDate, dateStr) = dlg.getData() | 254 (dateData, currentDate, dateStr) = dlg.getData() |
| 255 | 255 |
| 256 args = [] | 256 args = [] |
| 257 args.append("qnew") | 257 args.append("qnew") |
| 258 if message != "": | 258 if message != "": |
| 259 args.append("--message") | 259 args.append("--message") |
| 301 from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog | 301 from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog |
| 302 dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, | 302 dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, |
| 303 currentMessage) | 303 currentMessage) |
| 304 if dlg.exec_() == QDialog.Accepted: | 304 if dlg.exec_() == QDialog.Accepted: |
| 305 name, message, (userData, currentUser, userName), \ | 305 name, message, (userData, currentUser, userName), \ |
| 306 (dateData, currentDate, dateStr) = dlg.getData() | 306 (dateData, currentDate, dateStr) = dlg.getData() |
| 307 if message != "" and message != currentMessage: | 307 if message != "" and message != currentMessage: |
| 308 args.append("--message") | 308 args.append("--message") |
| 309 args.append(message) | 309 args.append(message) |
| 310 if userData: | 310 if userData: |
| 311 if currentUser: | 311 if currentUser: |
