Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
- branch
- Py2 comp.
- changeset 3057
- 10516539f238
- parent 2525
- 8b507a9a2d40
- parent 3008
- 7848489bcb92
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3056:9986ec0e559a | 3057:10516539f238 |
|---|---|
| 66 return | 66 return |
| 67 | 67 |
| 68 if rev is None: | 68 if rev is None: |
| 69 if self.vcs.isExtensionActive("bookmarks"): | 69 if self.vcs.isExtensionActive("bookmarks"): |
| 70 bookmarksList = \ | 70 bookmarksList = \ |
| 71 self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) | 71 self.vcs.getExtensionObject("bookmarks")\ |
| 72 .hgGetBookmarksList(repodir) | |
| 72 else: | 73 else: |
| 73 bookmarksList = None | 74 bookmarksList = None |
| 74 dlg = HgRevisionSelectionDialog(self.vcs.hgGetTagsList(repodir), | 75 dlg = HgRevisionSelectionDialog( |
| 75 self.vcs.hgGetBranchesList(repodir), | 76 self.vcs.hgGetTagsList(repodir), |
| 76 bookmarksList) | 77 self.vcs.hgGetBranchesList(repodir), |
| 78 bookmarksList) | |
| 77 if dlg.exec_() == QDialog.Accepted: | 79 if dlg.exec_() == QDialog.Accepted: |
| 78 rev = dlg.getRevision() | 80 rev = dlg.getRevision() |
| 79 | 81 |
| 80 if rev is not None: | 82 if rev is not None: |
| 81 if rev == "": | 83 if rev == "": |
| 102 if os.path.splitdrive(repodir)[1] == os.sep: | 104 if os.path.splitdrive(repodir)[1] == os.sep: |
| 103 return | 105 return |
| 104 | 106 |
| 105 if self.vcs.isExtensionActive("bookmarks"): | 107 if self.vcs.isExtensionActive("bookmarks"): |
| 106 bookmarksList = \ | 108 bookmarksList = \ |
| 107 self.vcs.getExtensionObject("bookmarks").hgGetBookmarksList(repodir) | 109 self.vcs.getExtensionObject("bookmarks")\ |
| 110 .hgGetBookmarksList(repodir) | |
| 108 else: | 111 else: |
| 109 bookmarksList = None | 112 bookmarksList = None |
| 110 from .HgGpgSignDialog import HgGpgSignDialog | 113 from .HgGpgSignDialog import HgGpgSignDialog |
| 111 dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), | 114 dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), |
| 112 self.vcs.hgGetBranchesList(repodir), | 115 self.vcs.hgGetBranchesList(repodir), |
