Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py
- changeset 7759
- 51aa6c6b66f7
- parent 7679
- 5816200f021b
- child 7780
- 41420f82c0ac
equal
deleted
inserted
replaced
| 7758:dd54d33d21d2 | 7759:51aa6c6b66f7 |
|---|---|
| 66 if rev is None: | 66 if rev is None: |
| 67 dlg = HgRevisionSelectionDialog( | 67 dlg = HgRevisionSelectionDialog( |
| 68 self.vcs.hgGetTagsList(repodir), | 68 self.vcs.hgGetTagsList(repodir), |
| 69 self.vcs.hgGetBranchesList(repodir), | 69 self.vcs.hgGetBranchesList(repodir), |
| 70 self.vcs.hgGetBookmarksList(repodir)) | 70 self.vcs.hgGetBookmarksList(repodir)) |
| 71 if dlg.exec_() == QDialog.Accepted: | 71 if dlg.exec() == QDialog.Accepted: |
| 72 rev = dlg.getRevision(revset=False) | 72 rev = dlg.getRevision(revset=False) |
| 73 | 73 |
| 74 if rev is not None: | 74 if rev is not None: |
| 75 if rev == "": | 75 if rev == "": |
| 76 rev = "tip" | 76 rev = "tip" |
| 78 args.append(rev) | 78 args.append(rev) |
| 79 | 79 |
| 80 dia = HgDialog(self.tr('Verify Signatures'), self.vcs) | 80 dia = HgDialog(self.tr('Verify Signatures'), self.vcs) |
| 81 res = dia.startProcess(args, repodir) | 81 res = dia.startProcess(args, repodir) |
| 82 if res: | 82 if res: |
| 83 dia.exec_() | 83 dia.exec() |
| 84 | 84 |
| 85 def hgGpgSign(self, path, revisions=None): | 85 def hgGpgSign(self, path, revisions=None): |
| 86 """ | 86 """ |
| 87 Public method used to list the available bookmarks. | 87 Public method used to list the available bookmarks. |
| 88 | 88 |
| 101 if revisions is None: | 101 if revisions is None: |
| 102 from .HgGpgSignDialog import HgGpgSignDialog | 102 from .HgGpgSignDialog import HgGpgSignDialog |
| 103 dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), | 103 dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), |
| 104 self.vcs.hgGetBranchesList(repodir), | 104 self.vcs.hgGetBranchesList(repodir), |
| 105 self.vcs.hgGetBookmarksList(repodir)) | 105 self.vcs.hgGetBookmarksList(repodir)) |
| 106 if dlg.exec_() == QDialog.Accepted: | 106 if dlg.exec() == QDialog.Accepted: |
| 107 revision, noCommit, message, keyId, local, force = ( | 107 revision, noCommit, message, keyId, local, force = ( |
| 108 dlg.getData() | 108 dlg.getData() |
| 109 ) | 109 ) |
| 110 if revision: | 110 if revision: |
| 111 revisions = [revision] | 111 revisions = [revision] |
| 137 args.append(rev) | 137 args.append(rev) |
| 138 | 138 |
| 139 dia = HgDialog(self.tr('Sign Revision'), self.vcs) | 139 dia = HgDialog(self.tr('Sign Revision'), self.vcs) |
| 140 res = dia.startProcess(args, repodir) | 140 res = dia.startProcess(args, repodir) |
| 141 if res: | 141 if res: |
| 142 dia.exec_() | 142 dia.exec() |
