Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py
Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3057
- 10516539f238
- parent 3036
- 30c81c9e88b8
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 89 process.readAllStandardOutput(), ioEncoding, | 89 process.readAllStandardOutput(), ioEncoding, |
| 90 'replace') | 90 'replace') |
| 91 | 91 |
| 92 self.bookmarksList = [] | 92 self.bookmarksList = [] |
| 93 for line in output.splitlines(): | 93 for line in output.splitlines(): |
| 94 l = line.strip().split() | 94 li = line.strip().split() |
| 95 if l[-1][0] in "1234567890": | 95 if li[-1][0] in "1234567890": |
| 96 # last element is a rev:changeset | 96 # last element is a rev:changeset |
| 97 del l[-1] | 97 del li[-1] |
| 98 if l[0] == "*": | 98 if li[0] == "*": |
| 99 del l[0] | 99 del li[0] |
| 100 name = " ".join(l) | 100 name = " ".join(li) |
| 101 self.bookmarksList.append(name) | 101 self.bookmarksList.append(name) |
| 102 | 102 |
| 103 return self.bookmarksList[:] | 103 return self.bookmarksList[:] |
| 104 | 104 |
| 105 def hgBookmarkDefine(self, name): | 105 def hgBookmarkDefine(self, name): |
| 286 process.readAllStandardOutput(), ioEncoding, | 286 process.readAllStandardOutput(), ioEncoding, |
| 287 'replace') | 287 'replace') |
| 288 | 288 |
| 289 for line in output.splitlines(): | 289 for line in output.splitlines(): |
| 290 if line.startswith(" "): | 290 if line.startswith(" "): |
| 291 l = line.strip().split() | 291 li = line.strip().split() |
| 292 del l[-1] | 292 del li[-1] |
| 293 name = " ".join(l) | 293 name = " ".join(li) |
| 294 bookmarksList.append(name) | 294 bookmarksList.append(name) |
| 295 | 295 |
| 296 return bookmarksList | 296 return bookmarksList |
| 297 | 297 |
| 298 def hgBookmarkPull(self, name): | 298 def hgBookmarkPull(self, name): |
| 321 args.append('pull') | 321 args.append('pull') |
| 322 args.append('--bookmark') | 322 args.append('--bookmark') |
| 323 args.append(bookmark) | 323 args.append(bookmark) |
| 324 | 324 |
| 325 dia = HgDialog(self.trUtf8( | 325 dia = HgDialog(self.trUtf8( |
| 326 'Pulling bookmark from a remote Mercurial repository'), | 326 'Pulling bookmark from a remote Mercurial repository'), |
| 327 self.vcs) | 327 self.vcs) |
| 328 res = dia.startProcess(args, repodir) | 328 res = dia.startProcess(args, repodir) |
| 329 if res: | 329 if res: |
| 330 dia.exec_() | 330 dia.exec_() |
| 331 | 331 |
| 355 args.append('push') | 355 args.append('push') |
| 356 args.append('--bookmark') | 356 args.append('--bookmark') |
| 357 args.append(bookmark) | 357 args.append(bookmark) |
| 358 | 358 |
| 359 dia = HgDialog(self.trUtf8( | 359 dia = HgDialog(self.trUtf8( |
| 360 'Pushing bookmark to a remote Mercurial repository'), | 360 'Pushing bookmark to a remote Mercurial repository'), |
| 361 self.vcs) | 361 self.vcs) |
| 362 res = dia.startProcess(args, repodir) | 362 res = dia.startProcess(args, repodir) |
| 363 if res: | 363 if res: |
| 364 dia.exec_() | 364 dia.exec_() |
